@saadnvd1/agent-os 0.3.615 → 0.3.620

package/components/Chat/ChatPanel.tsx

@@ -21,6 +21,7 @@ import {
 } from "@/lib/chat/group";
 import type { ApprovalDecision, ChatItem } from "@/lib/chat/events";
 import { isFreshCommand, withFresh } from "@/lib/chat/commands";
+import { compactsFirst } from "@/lib/chat/pending";
 import { useFreshStart } from "@/data/sessions";
 import {
   escapeAction,
@@ -692,6 +693,7 @@ export function ChatPanel({
                         }}
                         pending={{
                           status: p.status,
+                          compacting: compactsFirst(p, { state, compacting }),
                           error: p.error,
                           onRetry: () => retrySend(p.id),
                           onEdit: () => {

package/components/Chat/Messages.test.ts

@@ -50,12 +50,16 @@ describe("AssistantMessage quote action", () => {
 
 describe("a sent message not in the chat yet", () => {
   const user = { id: "user-c-1", kind: "user", text: "An article" } as never;
-  const render = (status: "sending" | "accepted" | "failed") =>
+  const render = (
+    status: "sending" | "accepted" | "failed",
+    compacting?: boolean
+  ) =>
     renderToStaticMarkup(
       createElement(UserMessage, {
         item: user,
         pending: {
           status,
+          compacting,
           error: "connection lost",
           onRetry: vi.fn(),
           onEdit: vi.fn(),
@@ -68,6 +72,9 @@ describe("a sent message not in the chat yet", () => {
     expect(render("sending")).toContain("opacity-60");
     expect(render("sending")).toContain("Sending");
     expect(render("accepted")).toContain("Starting the agent");
+    expect(render("accepted", true)).toContain("Compacting first");
+    expect(render("accepted", true)).not.toContain("Starting the agent");
+    expect(render("sending", true)).toContain("Sending");
   });
 
   it("says a failed one wasn't sent, with Retry and Edit", () => {

package/components/Chat/Messages.tsx

@@ -98,6 +98,8 @@ const UserText = memo(function UserText({ text }: { text: string }) {
 // A sent message not in the chat yet (lib/chat/pending).
 export interface PendingStatus {
   status: PendingSend["status"];
+  // The chat is compacting for this send (its real state, not a guess).
+  compacting?: boolean;
   error?: string;
   onRetry: () => void;
   onEdit: () => void;
@@ -141,7 +143,11 @@ function SendStatus({ pending }: { pending: PendingStatus }) {
       className="text-muted-foreground status-late flex items-center gap-1.5 font-mono text-[11px]"
     >
       <span className="status-live bg-muted-foreground h-1.5 w-1.5 rounded-full" />
-      {pending.status === "accepted" ? "Starting the agent" : "Sending"}
+      {pending.status !== "accepted"
+        ? "Sending"
+        : pending.compacting
+          ? "Compacting first"
+          : "Starting the agent"}
     </div>
   );
 }

package/components/Pane/DesktopTabBar.tsx

@@ -173,6 +173,7 @@ export function DesktopTabBar({
         {session?.working_directory && (
           <PaneViewToggle
             sessionId={session.id}
+            isChat={session.view === "chat"}
             viewMode={viewMode}
             isLocalSession={isLocalSession}
             isConductor={isConductor}

package/components/Pane/PaneViewToggle.tsx

@@ -18,6 +18,8 @@ import type { ViewMode } from "@/contexts/PaneContext";
 
 interface PaneViewToggleProps {
   sessionId?: string;
+  // The session runs as a chat, so its main view is the chat, not a terminal.
+  isChat?: boolean;
   viewMode: ViewMode;
   isLocalSession: boolean;
   isConductor: boolean;
@@ -75,6 +77,7 @@ function ToggleButton({
 // session only gets the terminal (and workers).
 export function PaneViewToggle({
   sessionId,
+  isChat,
   viewMode,
   isLocalSession,
   isConductor,
@@ -89,7 +92,7 @@ export function PaneViewToggle({
   return (
     <div className="bg-accent/50 flex shrink-0 items-center rounded-md p-0.5">
       <ToggleButton
-        label="Terminal"
+        label={isChat ? "Chat" : "Terminal"}
         active={viewMode === "terminal"}
         onClick={() => onViewModeChange("terminal")}
       >

package/components/views/DesktopAppActions.tsx

@@ -45,29 +45,35 @@ export function SidebarToggle({
   );
 }
 
-export function DesktopAppActions() {
+// A pinned sidebar has its own New button, so this one shows only while the
+// sidebar is hidden.
+export function DesktopAppActions({ showNew }: { showNew: boolean }) {
   return (
     <div
       className="flex shrink-0 items-center gap-0.5"
       onClick={(e) => e.stopPropagation()}
     >
       <InboxButton />
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            size="icon-sm"
-            aria-label="New session"
-            className="ml-1 h-7 w-7"
-            onClick={() => newDraft({ kind: "current" })}
-          >
-            <Plus className="h-4 w-4" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>
-          <p>New session</p>
-          <p className="text-muted-foreground text-xs">{DRAFT_KEYS.current}</p>
-        </TooltipContent>
-      </Tooltip>
+      {showNew && (
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button
+              size="icon-sm"
+              aria-label="New session"
+              className="ml-1 h-7 w-7"
+              onClick={() => newDraft({ kind: "current" })}
+            >
+              <Plus className="h-4 w-4" />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>New session</p>
+            <p className="text-muted-foreground text-xs">
+              {DRAFT_KEYS.current}
+            </p>
+          </TooltipContent>
+        </Tooltip>
+      )}
     </div>
   );
 }

package/components/views/DesktopView.tsx

@@ -59,7 +59,7 @@ export function DesktopView({
             leading={
               <SidebarToggle isPinned={isPinned} togglePin={togglePin} />
             }
-            trailing={<DesktopAppActions />}
+            trailing={<DesktopAppActions showNew={!isPinned} />}
           >
             <PaneLayout renderPane={renderPane} />
           </PaneBarSlotsProvider>

package/lib/chat/pending.ts

@@ -1,4 +1,4 @@
-import type { ChatImage } from "./events";
+import type { ChatImage, ChatState } from "./events";
 
 // A message the composer sent that isn't in the chat or its queue yet. It
 // shows as a bubble at once, and stays (as failed, with Retry) if it never
@@ -113,6 +113,18 @@ export function pendingReducer(
   }
 }
 
+// A compact-first send reads "Compacting first" from the server accepting it
+// until compaction is over. The chat is idle in that gap (compaction starts
+// it running), so idle means it hasn't begun; running with no compaction
+// means it finished, or the server decided not to compact.
+export const compactsFirst = (
+  p: Pick<PendingSend, "status" | "compact">,
+  chat: { state: ChatState; compacting: unknown }
+) =>
+  !!p.compact &&
+  p.status === "accepted" &&
+  (!!chat.compacting || chat.state === "idle");
+
 // What a new socket sends again: anything not failed and not over its sends.
 // Safe to repeat: the server drops an id already in the chat or its queue.
 export const toResend = (state: PendingSend[]) =>

package/lib/learning-cards/apply.ts

@@ -8,11 +8,14 @@ import { experimentOn } from "../experiments";
 import { getOrchestrator } from "../orchestrator/home";
 import { quickPR, startQuickChange } from "../orchestrator/quick";
 import { addRule } from "../orchestrator/rules";
-import { isRemoteHost } from "../hosts";
+import { hostExec, isRemoteHost } from "../hosts";
+import { shellQuote } from "../hosts/ssh";
 import { getProject } from "../projects";
 import { createRecipe, getRecipe, updateRecipe } from "../recipes/store";
 import { recipePrefill } from "../recipes/draft";
-import { createTask } from "../tasks";
+import { createTask, dropTask } from "../tasks";
+import { gitOk } from "../git-exec";
+import { expandHome } from "../tasks/session";
 import { claimCard, getCard, releaseCard, settleCard } from "./store";
 import type { Card, LessonPayload, RecipePayload } from "./types";
 
@@ -46,6 +49,22 @@ export function withLesson(text: string, line: string): string {
 const clean = (s: string | undefined, max: number) =>
   (s ?? "").replace(/\s+/g, " ").trim().slice(0, max);
 
+// Whether the remote checkout ignores CLAUDE.md; null when it can't be told.
+async function remoteIgnores(hostId: string, dir: string) {
+  const rest = dir.replace(/^~/, "");
+  const cd = rest === dir ? shellQuote(dir) : `"$HOME"${shellQuote(rest)}`;
+  try {
+    const { stdout } = await hostExec(
+      hostId,
+      `cd ${cd} && git check-ignore -q CLAUDE.md; echo $?`
+    );
+    const code = stdout.trim().split("\n").pop();
+    return code === "0" ? true : code === "1" ? false : null;
+  } catch {
+    return null;
+  }
+}
+
 async function toClaudeMd(card: Card, p: LessonPayload, line: string) {
   const project = p.projectId ? getProject(p.projectId) : null;
   if (!project) throw new CardRefused("That project is gone");
@@ -55,6 +74,28 @@ async function toClaudeMd(card: Card, p: LessonPayload, line: string) {
       .prepare(`SELECT name FROM sessions WHERE id = ?`)
       .get(card.session_id) as { name: string } | undefined
   )?.name;
+  // Ignored CLAUDE.md is local dev notes: a worktree never has it, so a quick
+  // change or task would have nothing to commit and no PR could open.
+  if (isRemoteHost(project.host_id)) {
+    if (
+      (await remoteIgnores(project.host_id, project.working_directory)) !==
+      false
+    )
+      throw new CardRefused(
+        `${project.name} runs on another machine and its CLAUDE.md is gitignored or can't be checked; add the lesson there by hand`
+      );
+  } else if (
+    await gitOk(expandHome(project.working_directory), [
+      "check-ignore",
+      "-q",
+      "CLAUDE.md",
+    ])
+  ) {
+    const file = path.join(expandHome(project.working_directory), "CLAUDE.md");
+    const before = fs.existsSync(file) ? fs.readFileSync(file, "utf8") : "";
+    fs.writeFileSync(file, withLesson(before, line));
+    return "CLAUDE.md";
+  }
   if (
     workspaceId &&
     getOrchestrator(workspaceId) &&
@@ -68,12 +109,17 @@ async function toClaudeMd(card: Card, p: LessonPayload, line: string) {
     const file = path.join(quick.worktreePath, "CLAUDE.md");
     const before = fs.existsSync(file) ? fs.readFileSync(file, "utf8") : "";
     fs.writeFileSync(file, withLesson(before, line));
-    await quickPR(
-      workspaceId,
-      quick.id,
-      "docs: add a lesson to CLAUDE.md",
-      `${line}${source ? `\n\nFrom the session "${source}".` : ""}`
-    );
+    try {
+      await quickPR(
+        workspaceId,
+        quick.id,
+        "docs: add a lesson to CLAUDE.md",
+        `${line}${source ? `\n\nFrom the session "${source}".` : ""}`
+      );
+    } catch (e) {
+      await dropTask(quick.id).catch(() => {});
+      throw e;
+    }
     return quick.id;
   }
   const task = await createTask({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.615",
+  "version": "0.3.620",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"