hop2 0.11.20 → 0.11.21

package/hay/apps/web/src/components/SessionSwitcher.tsx

@@ -2368,23 +2368,49 @@ export const SessionSwitcher = ({
         // or be an agent-created session they never opened. Name it, say
         // where it lives, and put it on screen — the answer to "it doesn't
         // work" should be the session that was in the way.
+        // Search the WHOLE fleet, not the visible wall: the holder may be
+        // hidden — parked, or an agent-created session on the other tab
+        // (the mybot incident: create "failed", the explanation was a
+        // session the user could not see). A silent 409 with an invisible
+        // cause reads as "it just doesn't work"; the answer must be the
+        // session that was in the way, revealed.
         const taken = res.status === 409
-          ? wallSessions.find((s) => (s.displayName || s.name).toLowerCase() === next.toLowerCase())
+          ? sessions.find((s) => (s.displayName || s.name).toLowerCase() === next.toLowerCase())
           : null;
         if (taken) {
           const home = folders.find((f) => f.id === taken.folderId);
-          onNotice(`"${taken.displayName || taken.name}" already exists${home ? ` in ${home.name}` : ""} — showing it`);
+          const visible = wallSessions.some((s) => sessionKey(s) === sessionKey(taken));
+          const hiddenByOrigin = !visibleSessions.some((s) => sessionKey(s) === sessionKey(taken));
+          const where = taken.parked
+            ? " — it was hidden among the parked sessions"
+            : hiddenByOrigin
+              ? " — it was hidden on the Agent sessions tab"
+              : home ? ` in ${home.name}` : "";
+          onNotice(`"${taken.displayName || taken.name}" already exists${where} — showing it`);
           setCreating(false);
           setCreateDraft("");
           setCreateInFolder(null);
+          // Reveal before focusing: flip whatever filter is hiding it.
+          if (hiddenByOrigin) setOriginScope("all");
+          if (taken.parked) setParkedOpen(true);
           const key = sessionKey(taken);
           setFocusedKey(key);
-          const idx = navIndexByKey.get(key);
-          if (typeof idx === "number") {
-            setKbdIndex(idx);
-            requestAnimationFrame(() => {
-              document.querySelector(`[data-nav-index="${idx}"]`)?.scrollIntoView({ block: "center" });
-            });
+          if (visible) {
+            const idx = navIndexByKey.get(key);
+            if (typeof idx === "number") {
+              setKbdIndex(idx);
+              requestAnimationFrame(() => {
+                document.querySelector(`[data-nav-index="${idx}"]`)?.scrollIntoView({ block: "center" });
+              });
+            }
+          } else {
+            // It enters the wall on the NEXT render (scope/park state just
+            // changed); scroll once the card exists.
+            window.setTimeout(() => {
+              const el = document.querySelector(`[data-session-key="${CSS.escape(key)}"]`)
+                || document.querySelector(`[data-nav-index]`);
+              el?.scrollIntoView({ block: "center" });
+            }, 120);
           }
           return;
         }
@@ -2491,6 +2517,7 @@ export const SessionSwitcher = ({
         role="button"
         tabIndex={0}
         data-nav-index={navIndexByKey.get(key)}
+        data-session-key={key}
         className={`switcher-card${current ? " current" : ""}${activeNow ? " active-now" : ""}${kbdSelected ? " kbd-selected" : ""}${focusedKey === key ? " focused" : ""}${dragKey === key ? " dragging" : ""}${draggable ? " draggable" : ""}`}
         draggable={draggable}
         onDragStart={draggable ? (e) => { setDragKey(key); e.dataTransfer.effectAllowed = "move"; } : undefined}

package/hay/apps/web/src/utils/switcherModel.ts

@@ -182,7 +182,13 @@ export const filterSessionsByOrigin = (
 ) => {
   if (scope === "all") return sessions;
   if (scope === "agent") return sessions.filter((session) => session.createdBy === "agent");
-  return sessions.filter((session) => session.createdBy !== "agent");
+  // The user wall: everything not agent-made — PLUS anything filed in a
+  // folder. Folders are the user's own structure, and an agent only files a
+  // session into one because the user asked for it there ("create mybot
+  // under Softwares", relayed through an agent, landed createdBy=agent and
+  // VANISHED from the default wall — created, filed, invisible). Placement
+  // in user space outranks provenance.
+  return sessions.filter((session) => session.createdBy !== "agent" || !!session.folderId);
 };
 
 /**

package/hay/apps/web/test/SessionSwitcher.test.tsx

@@ -357,3 +357,36 @@ describe("manual folders in the wall", () => {
     expect(screen.getByRole("button", { name: /Search full history for/ })).toBeTruthy();
   });
 });
+
+describe("create colliding with a hidden session", () => {
+  afterEach(() => { vi.unstubAllGlobals(); });
+
+  it("explains the invisible holder and reveals it instead of failing mutely", async () => {
+    // The mybot incident, second act: the name is taken by a session the
+    // user cannot SEE (agent-created, loose, other tab). A bare "already in
+    // use" against an empty wall reads as "create silently did nothing".
+    const holder: SwitcherSession = {
+      name: "mybot", displayName: "mybot", internalName: "mybot",
+      active: true, starting: false, createdBy: "agent"
+    };
+    const onNotice = vi.fn();
+    vi.stubGlobal("fetch", vi.fn(async () => ({
+      ok: false,
+      status: 409,
+      json: async () => ({ error: "Session name already in use" })
+    })));
+
+    render(<SessionSwitcher {...props} onNotice={onNotice} sessions={[...sessions, holder]} open />);
+    // The holder is genuinely hidden on the default (user) tab.
+    expect(screen.queryByText("mybot")).toBeNull();
+
+    fireEvent.click(screen.getByRole("button", { name: "New session" }));
+    fireEvent.change(screen.getByLabelText("New session name"), { target: { value: "mybot" } });
+    fireEvent.submit(screen.getByLabelText("New session name").closest("form")!);
+    await new Promise((r) => setTimeout(r, 50));
+
+    expect(onNotice).toHaveBeenCalledWith(expect.stringMatching(/already exists.*hidden.*Agent/i));
+    // And the wall now SHOWS it — scope flipped so the answer is on screen.
+    expect(screen.getByText("mybot")).toBeTruthy();
+  });
+});

package/hay/apps/web/test/switcherModel.test.ts

@@ -473,3 +473,28 @@ describe("manual order never moves on its own", () => {
     expect(m.mode === "manual" && m.rows.map((r) => r.name)).toEqual(["c", "a", "b"]);
   });
 });
+
+describe("origin scope vs foldered sessions", () => {
+  const mk = (name: string, extra: Partial<SwitcherSession> = {}): SwitcherSession => ({
+    name, displayName: name, internalName: name, active: true, starting: false,
+    createdBy: "user", ...extra
+  });
+
+  it("a session an agent filed into the user's folder shows on the user wall", () => {
+    // The mybot incident: "create mybot under Softwares", relayed through an
+    // agent, landed createdBy=agent — created, filed, and invisible on the
+    // default tab. Placement in the user's own structure outranks provenance.
+    const sessions = [
+      mk("mine"),
+      mk("mybot", { createdBy: "agent", folderId: "f_soft" }),
+      mk("worker", { createdBy: "agent" })
+    ];
+    const user = filterSessionsByOrigin(sessions, "user").map((s) => s.name);
+    expect(user).toContain("mybot");
+    expect(user).toContain("mine");
+    expect(user).not.toContain("worker"); // loose agent workers stay on their tab
+
+    // The agent tab still lists it — it IS agent-created; no tab lies.
+    expect(filterSessionsByOrigin(sessions, "agent").map((s) => s.name)).toContain("mybot");
+  });
+});