mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-16 12:01:13 +00:00
* fix(ai): keep dropped AI chats recoverable with dangling marking and /rebind Closing a member terminal or dissolving a workspace used to clear the chat's active pointer, making it invisible (scope rank 0) and unrecoverable from the UI even though the record survived in storage. - orphan cleanup now marks dropped chats `scopeDangling: true` and keeps record + active pointer intact; the flag clears when the target returns or the chat is rebound - `/chats` lists dangling chats with a numbered inline affordance and hint line - new `/rebind <n>` panel action rewrites `scope` to the panel's current scope, clears the marker and restores the active pointer - i18n keys added for en / zh-CN / zh-TW / es / ru Stacked on #4018. Refs #4015 (R2). * fix(workspace): reuse existing workspace id when merging tabs with a workspace createWorkspaceFromSessions silently no-opped when either merged tab already belonged to a workspace (e.g. dragging a workspace pane onto a standalone terminal), and the older dissolve->recreate behavior regenerated the id that workspace-scoped AI chats bind to. When one of the merged tabs has a workspace, the orphan tab now joins that existing workspace (pane inserted next to the anchor session, tab slot collapsed), so workspace-scoped chat bindings survive. Merging two standalone tabs still creates a fresh workspace. Stacked on #4018. Refs #4015 (R3). * fix(ai): persist cleaned active map on dangling chat rebind rebindSessionScope was updating React state to drop stale old-scope pointers, then rebuilding localStorage from the pre-rebind snapshot and resurrecting them. Persist the same cleaned map via rebindActiveSessionMap. * fix(ai): persist rebind map inside setState; wire backup actions on terminal panel - Write cleaned active-session map from inside the rebind updater so a deferred React setState cannot skip snapshot/localStorage persistence. - Pass exportSessionsBackup/importSessionsBackup through TerminalLayerSupport and include them in AI_CHAT_SIDE_PANEL_AI_STATE_KEYS so history-drawer backup buttons work on the normal terminal path. * fix(ai): guard backup restore races and use app-wide live targets for /chats - Skip restore when in-memory sessions already exist; apply snapshot, storage write, and AI state emit atomically inside the empty-state path so peer useAIState instances see the restore. - Thread validAIScopeTargetIds into AIChatSidePanel as liveScopeTargetIds so /chats does not mark chats bound to other open terminals as dangling. * fix(ai): open rebound chat in panel view and refresh /chats listing - rebindSessionScope also sets the panel view to the rebound session so an existing draft/other chat does not keep hiding the recovery. - After /rebind, rewrite the stored listing instead of rebuilding from the stale render so the chat is no longer offered as dangling. * fix(workspace): invert join split when dragged pane owns workspace; refresh /chats titles - When merging a workspace-owned dragged pane onto a standalone tab, the orphan is inserted — invert the drop position so the previewed side matches. - Compare workspaces in AIChatSidePanel memo so /chats picks up renames. * fix(ai): validate live sessions array on boot; mark imported orphans dangling - Reject parseable non-array store values (e.g. {}) via readLiveSessionsArray so boot restore is not blocked by a corrupt-but-truthy value. - After manual import, re-run orphan cleanup with the last known live target set so chats bound to closed scopes become dangling and /rebind-able. * fix(ai): merge imported sessions before orphan cleanup Apply import merge to the snapshot/ref synchronously, then run dangling marking, so a deferred setState cannot let cleanup rewrite over the import. * fix(ai): mark restored/imported orphans dangling even with no live targets Restore and import do not change live terminals/workspaces, so the orphan cleanup effect will not re-run. Always call cleanup against the last known live target set after those paths — an empty set is a valid observed state (nothing mounted), not an unavailable snapshot — so chats bound to missing scopes become dangling and /chats can offer /rebind. * fix(ai): apply backup restore synchronously before dangling cleanup Do not gate restore + orphan marking on a setState updater having run. A deferred updater left didRestore false, skipped cleanup, and could leave restored chats with missing scopes unmarked and unrebindable from /chats. * fix(ai): complete /rebind from a partial slash picker selection Selecting Rebind after typing `/re` left the composer unchanged, so a following number became `/re 1` and could be sent to the agent. Replace the slash query with `/rebind ` the same way Rename does. * fix(ai): replace hostIds on rebind; skip non-array backup generations - Rebind builds a fresh destination scope (including hostIds from the panel) instead of spreading the old scope, so history matching follows the new terminal/workspace host. - readLatestGeneration treats valid JSON that is not a session array as unusable and continues to older generations, matching corrupt skips. * fix(ai): revalidate dangling chat before /rebind from stale /chats listing Skip rebind when the cached entry is deleted or already bound to a live scope; drop stale listing entries so a second panel cannot steal the chat. * fix(ai): reject malformed /rebind numbers Require the entire trimmed argument to be digits so /rebind 1foo and /rebind 1.5 show usage instead of silently targeting index 1. --------- Co-authored-by: binaricat <binaricat@users.noreply.github.com> Co-authored-by: 陈大猫 <16399091+binaricat@users.noreply.github.com>
148 lines
5.2 KiB
TypeScript
148 lines
5.2 KiB
TypeScript
import assert from "node:assert/strict";
|
|
import test from "node:test";
|
|
import React from "react";
|
|
import { act, create, type ReactTestRenderer } from "react-test-renderer";
|
|
|
|
import { collectSessionIds } from "../../domain/workspace.ts";
|
|
import { useSessionState } from "./useSessionState.ts";
|
|
|
|
type SessionState = ReturnType<typeof useSessionState>;
|
|
|
|
test("merging a workspace tab with a standalone tab reuses the workspace id (issue #4015 R3)", async (t) => {
|
|
const previousWindow = Object.getOwnPropertyDescriptor(globalThis, "window");
|
|
const eventTarget = new EventTarget() as EventTarget & Record<string, unknown>;
|
|
Object.assign(eventTarget, {
|
|
setTimeout,
|
|
clearTimeout,
|
|
});
|
|
Object.defineProperty(globalThis, "window", {
|
|
configurable: true,
|
|
value: eventTarget,
|
|
});
|
|
t.after(() => {
|
|
if (previousWindow) Object.defineProperty(globalThis, "window", previousWindow);
|
|
else Reflect.deleteProperty(globalThis, "window");
|
|
});
|
|
|
|
const actEnvironment = globalThis as typeof globalThis & {
|
|
IS_REACT_ACT_ENVIRONMENT?: boolean;
|
|
};
|
|
const previousActEnvironment = actEnvironment.IS_REACT_ACT_ENVIRONMENT;
|
|
actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
|
|
t.after(() => {
|
|
actEnvironment.IS_REACT_ACT_ENVIRONMENT = previousActEnvironment;
|
|
});
|
|
|
|
let state: SessionState | null = null;
|
|
let renderer: ReactTestRenderer | null = null;
|
|
const current = (): SessionState => {
|
|
assert.ok(state);
|
|
return state;
|
|
};
|
|
function Probe() {
|
|
state = useSessionState({ persistSessionRestore: false });
|
|
return null;
|
|
}
|
|
|
|
await act(async () => {
|
|
renderer = create(React.createElement(Probe));
|
|
});
|
|
|
|
let baseId = "";
|
|
let memberId = "";
|
|
let standaloneId = "";
|
|
await act(async () => {
|
|
baseId = current().createLocalTerminal({ shellName: "01" });
|
|
memberId = current().createLocalTerminal({ shellName: "02" });
|
|
standaloneId = current().createLocalTerminal({ shellName: "03" });
|
|
});
|
|
|
|
await act(async () => {
|
|
current().createWorkspaceFromSessions(baseId, memberId, {
|
|
direction: "vertical",
|
|
position: "right",
|
|
targetSessionId: baseId,
|
|
});
|
|
});
|
|
const workspaceId = current().workspaces[0]?.id;
|
|
assert.ok(workspaceId);
|
|
assert.equal(current().sessions.find((s) => s.id === standaloneId)?.workspaceId ?? "", "");
|
|
|
|
// Dropping the standalone tab onto a member of the workspace must join the
|
|
// existing workspace — regenerating the id would strand AI chats bound to it.
|
|
await act(async () => {
|
|
current().createWorkspaceFromSessions(standaloneId, memberId, {
|
|
direction: "vertical",
|
|
position: "right",
|
|
targetSessionId: standaloneId,
|
|
});
|
|
});
|
|
|
|
assert.equal(current().workspaces.length, 1);
|
|
assert.equal(current().workspaces[0]?.id, workspaceId);
|
|
assert.equal(
|
|
current().sessions.find((s) => s.id === standaloneId)?.workspaceId,
|
|
workspaceId,
|
|
);
|
|
const memberIds = collectSessionIds(current().workspaces[0]!.root);
|
|
assert.ok(memberIds.includes(standaloneId));
|
|
assert.ok(memberIds.includes(memberId));
|
|
// The standalone tab slot is replaced by the workspace tab.
|
|
assert.ok(!current().orderedTabs.includes(standaloneId));
|
|
|
|
|
|
// Dropping a workspace member onto a standalone tab must insert the
|
|
// standalone on the opposite side of the drop hint (hint describes where
|
|
// the dragged member should appear relative to the standalone).
|
|
let orientationStandaloneId = "";
|
|
let orientationMemberId = "";
|
|
await act(async () => {
|
|
orientationStandaloneId = current().createLocalTerminal({ shellName: "orient-standalone" });
|
|
});
|
|
// memberId is already in workspaceId; drop member onto the new standalone with position "right"
|
|
// (preview: member to the right of standalone ⇒ standalone should end up LEFT of member).
|
|
await act(async () => {
|
|
current().createWorkspaceFromSessions(orientationStandaloneId, memberId, {
|
|
direction: "vertical",
|
|
position: "right",
|
|
targetSessionId: orientationStandaloneId,
|
|
});
|
|
});
|
|
{
|
|
const root = current().workspaces.find((ws) => ws.id === workspaceId)?.root;
|
|
assert.ok(root);
|
|
const ordered = collectSessionIds(root!);
|
|
const standaloneIdx = ordered.indexOf(orientationStandaloneId);
|
|
const memberIdx = ordered.indexOf(memberId);
|
|
assert.ok(standaloneIdx >= 0 && memberIdx >= 0);
|
|
assert.ok(
|
|
standaloneIdx < memberIdx,
|
|
`expected standalone left of member after inverted right-drop, got order ${ordered.join(",")}`,
|
|
);
|
|
}
|
|
|
|
// Two genuinely standalone tabs still create a fresh workspace.
|
|
let firstStandaloneId = "";
|
|
let secondStandaloneId = "";
|
|
await act(async () => {
|
|
firstStandaloneId = current().createLocalTerminal({ shellName: "04" });
|
|
secondStandaloneId = current().createLocalTerminal({ shellName: "05" });
|
|
});
|
|
await act(async () => {
|
|
current().createWorkspaceFromSessions(firstStandaloneId, secondStandaloneId, {
|
|
direction: "vertical",
|
|
position: "right",
|
|
targetSessionId: firstStandaloneId,
|
|
});
|
|
});
|
|
|
|
assert.equal(current().workspaces.length, 2);
|
|
const freshWorkspace = current().workspaces.find((candidate) => candidate.id !== workspaceId);
|
|
assert.ok(freshWorkspace);
|
|
assert.notEqual(freshWorkspace.id, workspaceId);
|
|
|
|
await act(async () => {
|
|
renderer?.unmount();
|
|
});
|
|
});
|