Merge branch 'main' into posthog-code/delete-seat-billing

Author: adboio

packages/agent/src/adapters/codex-app-server/mapping.ts

@@ -410,6 +410,9 @@ function describeTool(item: AppServerItem): ToolDescriptor | null {
         output: dynamicToolText(item.contentItems),
       };
     case "collabAgentToolCall":
+      if (item.tool === "wait" || item.tool === "closeAgent") {
+        return null;
+      }
       return {
         title: collabAgentTitle(item),
         kind: "other",

packages/core/src/billing/usageDisplay.test.ts

@@ -264,11 +264,27 @@ describe("formatResetTime", () => {
       expected: "Resets shortly",
     },
   ])("$name", ({ resetAt, expected }) => {
-    const result = formatResetTime(resetAt, NOW);
+    const result = formatResetTime(resetAt, { now: NOW });
     if (expected instanceof RegExp) {
       expect(result).toMatch(expected);
     } else {
       expect(result).toBe(expected);
     }
   });
+
+  it("swaps the leading phrase when a custom label is given", () => {
+    const opts = { now: NOW, label: "Billing period ends" };
+    expect(formatResetTime(isoAt(30 * 60 * 1000), opts)).toBe(
+      "Billing period ends in 30m",
+    );
+    expect(formatResetTime(isoAt(4 * 3600 * 1000), opts)).toBe(
+      "Billing period ends in 4h",
+    );
+    expect(formatResetTime(isoAt(-60_000), opts)).toBe(
+      "Billing period ends shortly",
+    );
+    expect(formatResetTime(isoAt(30 * 86400 * 1000), opts)).toMatch(
+      /^Billing period ends [A-Za-z]+ \d+ at /,
+    );
+  });
 });

packages/core/src/billing/usageDisplay.ts

@@ -88,14 +88,14 @@ export function isUsageExceeded(usage: UsageOutput): boolean {
 
 export function formatResetTime(
   resetAtIso: string,
-  now: number = Date.now(),
+  { now = Date.now(), label = "Resets" }: { now?: number; label?: string } = {},
 ): string {
   const parsed = Date.parse(resetAtIso);
   const ms = Number.isNaN(parsed) ? 0 : Math.max(0, parsed - now);
 
   const totalMinutes = Math.ceil(ms / 60_000);
-  if (totalMinutes <= 0) return "Resets shortly";
-  if (totalMinutes < 60) return `Resets in ${totalMinutes}m`;
+  if (totalMinutes <= 0) return `${label} shortly`;
+  if (totalMinutes < 60) return `${label} in ${totalMinutes}m`;
 
   const totalHours = ms / 3_600_000;
   if (totalHours < 24) {
@@ -106,8 +106,8 @@ export function formatResetTime(
       minutes = 0;
     }
     return minutes === 0
-      ? `Resets in ${hours}h`
-      : `Resets in ${hours}h ${minutes}m`;
+      ? `${label} in ${hours}h`
+      : `${label} in ${hours}h ${minutes}m`;
   }
 
   const target = new Date(now + ms);
@@ -120,5 +120,5 @@ export function formatResetTime(
     minute: "2-digit",
     timeZoneName: "short",
   });
-  return `Resets ${date} at ${time}`;
+  return `${label} ${date} at ${time}`;
 }

packages/ui/src/features/agent-applications/agent-builder/AgentBuilderDock.tsx

@@ -23,7 +23,6 @@ import { useAgentChatPendingApproval } from "../hooks/useAgentChatPendingApprova
 import { agentIngressBaseUrl } from "../utils/ingress";
 import { AgentBuilderMcpConnectDialog } from "./AgentBuilderMcpConnectDialog";
 import { AgentBuilderSecretForm } from "./AgentBuilderSecretForm";
-import { AgentBuilderSeedDialog } from "./AgentBuilderSeedDialog";
 import {
   AGENT_BUILDER_CHAT_ID,
   AGENT_BUILDER_SLUG,
@@ -322,37 +321,22 @@ export function AgentBuilderDock() {
     setPendingMcpConnect(null);
   }
 
-  // Edit-with-AI hand-offs: send the seeded prompt once when a new seed lands.
-  // An empty dock starts immediately; if a chat is already in progress, confirm
-  // whether to start fresh or continue (so a deliberate "New agent" / "Edit with
-  // AI" doesn't silently wipe or append onto an unrelated conversation).
+  // Contextual hand-offs ("New agent" / "Edit with AI" / …): prefill the
+  // seeded prompt into the composer when a new seed lands — never send it. The
+  // user reviews and hits send, so opening the dock doesn't fire a chat on its
+  // own. Prefilling is non-destructive, so no start-fresh-vs-continue prompt is
+  // needed: it drops into whatever chat is open, and the header "New chat" (+)
+  // clears first if the user wants a fresh conversation.
   const lastSeedRef = useRef(0);
-  const [seedConfirm, setSeedConfirm] = useState<string | null>(null);
+  const [draft, setDraft] = useState<{ text: string; token: number } | null>(
+    null,
+  );
   useEffect(() => {
     if (!seed || seed.seq === lastSeedRef.current) return;
     lastSeedRef.current = seed.seq;
     consumeSeed(seed.seq);
-    if (chat.messages.length === 0) {
-      chat.send(seed.prompt);
-    } else {
-      setSeedConfirm(seed.prompt);
-    }
-  }, [seed, chat, consumeSeed]);
-
-  function seedStartFresh() {
-    if (!seedConfirm) return;
-    setPendingSecret(null);
-    setPendingMcpConnect(null);
-    chat.newChat();
-    setLastSession(null);
-    chat.send(seedConfirm);
-    setSeedConfirm(null);
-  }
-  function seedContinue() {
-    if (!seedConfirm) return;
-    chat.send(seedConfirm);
-    setSeedConfirm(null);
-  }
+    setDraft({ text: seed.prompt, token: seed.seq });
+  }, [seed, consumeSeed]);
 
   return (
     <Flex
@@ -432,6 +416,7 @@ export function AgentBuilderDock() {
           placeholder={placeholder}
           emptyState={<AgentBuilderEmptyState page={page} onPick={chat.send} />}
           emptyHint="Ask the agent builder to inspect, debug, or edit your agents. It can see what you're looking at and walk you there."
+          draft={draft ?? undefined}
           belowConversation={
             pendingApproval ? (
               <AgentChatPendingApprovalCard
@@ -459,14 +444,6 @@ export function AgentBuilderDock() {
         />
       )}
 
-      <AgentBuilderSeedDialog
-        open={seedConfirm != null}
-        prompt={seedConfirm ?? ""}
-        onStartFresh={seedStartFresh}
-        onContinue={seedContinue}
-        onCancel={() => setSeedConfirm(null)}
-      />
-
       <AgentBuilderMcpConnectDialog
         pending={pendingMcpConnect}
         busy={mcpConnectBusy}

packages/ui/src/features/agent-applications/agent-builder/AgentBuilderSeedDialog.tsx

@@ -27,7 +27,8 @@ export type AgentBuilderPageContext =
   | { kind: "agent-chat"; slug: string }
   | { kind: "unknown" };
 
-/** A pending "Edit with AI" hand-off: open the dock and send `prompt`. */
+/** A pending contextual hand-off: open the dock and prefill the composer with
+ *  `prompt` (the user reviews and sends — it is never auto-sent). */
 export interface AgentBuilderSeed {
   /** Monotonic id so a consumer can mark exactly one seed handled. */
   seq: number;
@@ -113,7 +114,7 @@ interface AgentBuilderStore {
   setVisible: (visible: boolean) => void;
   setFollowMode: (followMode: boolean) => void;
   setPage: (page: AgentBuilderPageContext) => void;
-  /** Open the dock and queue a prompt to send. */
+  /** Open the dock and prefill the composer with a prompt (not sent). */
   startAgentBuilder: (prompt: string, agentSlug?: string | null) => void;
   /** Mark a seed handled (no-op if a newer seed has since replaced it). */
   consumeSeed: (seq: number) => void;

packages/ui/src/features/agent-applications/agent-builder/agentBuilderStore.ts

@@ -8,7 +8,13 @@ import {
 import type { AcpMessage } from "@posthog/shared";
 import { ThreadView } from "@posthog/ui/features/sessions/components/ThreadView";
 import { Flex, Text, Tooltip } from "@radix-ui/themes";
-import { type KeyboardEvent, type ReactNode, useState } from "react";
+import {
+  type KeyboardEvent,
+  type ReactNode,
+  useEffect,
+  useRef,
+  useState,
+} from "react";
 
 /**
  * The conversation + composer half of a deployed-agent chat, shared by the
@@ -28,6 +34,7 @@ export function AgentChatSurface({
   composerDisabledReason,
   scrollX = true,
   placeholder = "Message this agent…",
+  draft,
   onSend,
   onCancel,
 }: {
@@ -50,6 +57,10 @@ export function AgentChatSurface({
   scrollX?: boolean;
   /** Composer placeholder. */
   placeholder?: string;
+  /** When set, prefills the composer with `text` (without sending). Bump
+   * `token` each time a new draft should repopulate the input — the same text
+   * re-applies on a fresh token so re-triggering a seeded prompt works. */
+  draft?: { text: string; token: number };
   onSend: (text: string) => void;
   onCancel: () => void;
 }) {
@@ -84,6 +95,7 @@ export function AgentChatSurface({
         isStreaming={isStreaming}
         placeholder={placeholder}
         disabledReason={composerDisabledReason}
+        draft={draft}
         onSend={onSend}
         onCancel={onCancel}
       />
@@ -95,17 +107,33 @@ function Composer({
   isStreaming,
   placeholder,
   disabledReason,
+  draft,
   onSend,
   onCancel,
 }: {
   isStreaming: boolean;
   placeholder: string;
   disabledReason?: string;
+  draft?: { text: string; token: number };
   onSend: (text: string) => void;
   onCancel: () => void;
 }) {
   const [text, setText] = useState("");
   const parked = !!disabledReason;
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+
+  // Prefill (but don't send) when a new draft lands — a seeded prompt drops into
+  // the composer for the user to review, edit, and send. Keyed on `token` so the
+  // same prompt re-applies on a fresh trigger. Never clobber text the user has
+  // already typed but not sent: if the composer is non-empty, leave it as-is
+  // (still focusing it) so a seeded prompt is genuinely non-destructive.
+  const lastDraftToken = useRef<number | null>(null);
+  useEffect(() => {
+    if (!draft || draft.token === lastDraftToken.current) return;
+    lastDraftToken.current = draft.token;
+    setText((current) => (current.trim() ? current : draft.text));
+    textareaRef.current?.focus();
+  }, [draft]);
 
   function submit() {
     if (parked) return;
@@ -132,6 +160,7 @@ function Composer({
     <div className="shrink-0 px-3 pt-2 pb-3">
       <InputGroup className="h-auto cursor-text bg-card focus-within:ring-1 focus-within:ring-purple-9">
         <InputGroupTextarea
+          ref={textareaRef}
           value={text}
           onChange={(e) => setText(e.target.value)}
           onKeyDown={onKeyDown}

packages/ui/src/features/agent-applications/components/AgentChatSurface.tsx

@@ -68,9 +68,10 @@ export function UsageButton() {
     meter.kind === "dollars"
       ? `${formatUsdAmount(meter.usedUsd)} of ${formatUsdAmount(meter.limitUsd)} used`
       : `${percent}% used`;
-  const resetLabel = formatResetTime(
-    meter.kind === "dollars" ? meter.resetAt : meter.bucket.reset_at,
-  );
+  const resetLabel =
+    meter.kind === "dollars"
+      ? formatResetTime(meter.resetAt, { label: "Billing period ends" })
+      : formatResetTime(meter.bucket.reset_at);
   const breakdownLabel =
     meter.kind === "dollars" && meter.breakdown
       ? formatUsageBreakdown(meter.breakdown)

packages/ui/src/features/billing/UsageButton.tsx

@@ -30,12 +30,6 @@ import { getBillingUrl } from "@posthog/ui/utils/urls";
 import { Badge, Button, Callout, Flex, Spinner, Text } from "@radix-ui/themes";
 import { useEffect } from "react";
 
-/**
- * Plan & usage under usage-based billing: no seats or plans to manage in-app —
- * payment methods, spend limits, and org-level usage live on the PostHog
- * billing page. The free-tier meters show the per-user allowance for
- * confirmed free-tier orgs; subscribed orgs have no per-user caps to meter.
- */
 export function PlanUsageSettings() {
   const billingEnabled = useFeatureFlag(BILLING_FLAG);
   const spendAnalysisEnabled = useSpendAnalysisEnabled();
@@ -163,7 +157,9 @@ export function PlanUsageSettings() {
           </Flex>
 
           <Flex direction="column" gap="3">
-            <Text className="font-medium text-(--gray-9) text-sm">Usage</Text>
+            <Text className="font-medium text-(--gray-9) text-sm">
+              Organization usage
+            </Text>
             {usageLoading ? (
               <Flex
                 align="center"
@@ -178,7 +174,7 @@ export function PlanUsageSettings() {
                 label={freeTier ? "Monthly free usage" : "Usage this period"}
                 percent={meter.percent}
                 valueLabel={`${formatUsdAmount(meter.usedUsd)} of ${formatUsdAmount(meter.limitUsd)}${freeTier ? " included" : ""}`}
-                detail={`${meter.exceeded ? "Limit exceeded. " : ""}${formatResetTime(meter.resetAt)}`}
+                detail={`${meter.exceeded ? "Limit exceeded. " : ""}${formatResetTime(meter.resetAt, { label: "Billing period ends" })}`}
                 breakdown={
                   meter.breakdown
                     ? { ...meter.breakdown, usedUsd: meter.usedUsd }

packages/ui/src/features/settings/sections/PlanUsageSettings.tsx

@@ -38,7 +38,7 @@ export function SpendAnalysisSection() {
     <Flex direction="column" gap="3">
       <Flex align="center" justify="between">
         <Text className="font-medium text-(--gray-9) text-sm">
-          Spend analysis
+          Personal spend analysis
         </Text>
         <Flex align="center" gap="4">
           <WindowSelector value={spendWindow} onChange={setSpendWindow} />