2e108b040f
* feat: session resumption with ACP session ID support - Add useSessionResumption hook for automatic session recovery on page reload - Fix ACPSessionID not being set on AgentInstance in Launch() and createInstance() - Add task.session.status and task.session.resume WebSocket actions - Fix shell terminal retry logic for resumed sessions - Fix taskSessionState reading from Zustand store instead of local state - Remove dead code: unused stream handling functions in lifecycle/manager.go - Fix test mock interfaces (CleanupStaleInstanceByTaskID, NewManager signature) - Add enhanced logging for session resumption debugging - Simplify page-client.tsx state merging logic * refactor: remove unused AgentController (dead code) - Delete agent_controller.go - entirely unused duplicate of Manager methods - Remove agentController field from Manager struct - Remove AgentController initialization in NewManager The AgentController duplicated StartAgentProcess, initializeACPSession, and PromptAgent from Manager but was never called. All agent control operations go through Manager's own methods. * refactor: remove unused MemoryRepository (dead code) - Delete memory.go - entire MemoryRepository implementation unused (replaced by SQLite repository) - Delete memory_test.go - tests for removed MemoryRepository Found via 'deadcode' tool analysis. * refactor: consolidate agentctl packages into server/client structure Reorganize the confusing dual agentctl packages: - internal/agentctl/* → internal/agentctl/server/ - internal/agent/agentctl/* → internal/agentctl/client/ Structure is now: internal/agentctl/ ├── client/ - HTTP client for talking to agentctl servers │ ├── client.go │ ├── standalone.go │ ├── acp.go │ └── launcher/ ├── server/ - agentctl server implementation (runs in containers) │ ├── api/ │ ├── adapter/ │ ├── acp/ │ ├── config/ │ ├── instance/ │ ├── process/ │ └── shell/ └── types/ - Shared types used by both client and server Also consolidated shared types (GitStatusUpdate, FileInfo, etc.) from process/types.go into the shared types/ package. * refactor: rename AgentInstance to AgentExecution for clarity Rename AgentInstance -> AgentExecution across the entire codebase to better reflect what it represents: an agent actively working on a task, not just a generic 'instance'. Changes: - AgentInstance struct -> AgentExecution - InstanceStore -> ExecutionStore (new file: execution_store.go) - RecoveredInstance -> RecoveredExecution - All method names: GetInstance* -> GetExecution*, ListInstances -> ListExecutions, etc. - All parameters: instanceID -> executionID - All local variables: instance -> execution - DTOs and JSON tags: agent_instance_id -> agent_execution_id - Database columns: agent_instance_id -> agent_execution_id Also consolidates duplicate prompt logic: - Merge sendInitialPrompt and SendPrompt into single SendPrompt method - Add validateStatus parameter to differentiate initial vs follow-up prompts Also extracts ACP session management to session.go: - Move initializeACPSession logic to SessionManager.InitializeAndPrompt - Move PromptAgent logic to SessionManager.SendPrompt - Manager now delegates to SessionManager for all prompt operations Also removes duplicate event publishing: - Remove 9 duplicate m.publish*() methods from manager.go - Use existing EventPublisher methods via m.eventPublisher.Publish*() Also extracts types to dedicated file: - Move AgentExecution, LaunchRequest, PromptResult, etc. to types.go Net reduction: ~600 lines removed from manager.go through deduplication and better separation of concerns. * fix(backend): Docker runtime now creates instance via ControlServer The Docker runtime was incorrectly creating an agentctl.Client pointing directly to port 9999 (the ControlServer port), then trying to call instance-specific APIs like /api/v1/agent/configure which only exist on per-instance servers. Fixed by making Docker runtime follow the same flow as standalone mode: - LaunchContainer now uses StandaloneCtl to create an instance via the control API, then creates Client pointing to the instance port - RecoverInstances queries the ControlServer to get the instance port - Added waitForHealth helper to wait for agentctl to be ready Also improved HTTP error handling in agentctl client: - All client methods now check HTTP status codes before JSON decoding - Better error messages include status code and response body * fix: restore session resumption imports and variables * fix: add sessionId prop back to TaskLayout
195 lines
7.2 KiB
TypeScript
195 lines
7.2 KiB
TypeScript
'use client';
|
|
|
|
import type { ReactNode } from 'react';
|
|
import { memo, useState } from 'react';
|
|
import { IconChevronDown, IconChevronUp, IconX } from '@tabler/icons-react';
|
|
import { Badge } from '@kandev/ui/badge';
|
|
import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from '@kandev/ui/resizable';
|
|
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@kandev/ui/tabs';
|
|
import { getLocalStorage, setLocalStorage } from '@/lib/local-storage';
|
|
import { COMMANDS } from '@/components/task/task-data';
|
|
import { ShellTerminal } from '@/components/task/shell-terminal';
|
|
|
|
type TaskRightPanelProps = {
|
|
topPanel: ReactNode;
|
|
taskId: string;
|
|
sessionId: string | null;
|
|
};
|
|
|
|
const DEFAULT_RIGHT_LAYOUT: [number, number] = [55, 45];
|
|
|
|
const TaskRightPanel = memo(function TaskRightPanel({ topPanel, taskId, sessionId }: TaskRightPanelProps) {
|
|
const [rightLayout, setRightLayout] = useState<[number, number]>(() =>
|
|
getLocalStorage('task-layout-right', DEFAULT_RIGHT_LAYOUT)
|
|
);
|
|
const [activeTerminalId, setActiveTerminalId] = useState(1);
|
|
const [terminalIds, setTerminalIds] = useState([1]);
|
|
const [isBottomCollapsed, setIsBottomCollapsed] = useState(false);
|
|
|
|
const addTerminal = () => {
|
|
setTerminalIds((ids) => {
|
|
const nextId = Math.max(0, ...ids) + 1;
|
|
setActiveTerminalId(nextId);
|
|
return [...ids, nextId];
|
|
});
|
|
};
|
|
|
|
const removeTerminal = (id: number) => {
|
|
setTerminalIds((ids) => {
|
|
const nextIds = ids.filter((terminalId) => terminalId !== id);
|
|
if (activeTerminalId === id) {
|
|
const fallback = nextIds[0] ?? 1;
|
|
setActiveTerminalId(fallback);
|
|
}
|
|
return nextIds.length ? nextIds : [1];
|
|
});
|
|
};
|
|
|
|
const terminalTabValue = activeTerminalId === 0 ? 'commands' : `terminal-${activeTerminalId}`;
|
|
|
|
if (isBottomCollapsed) {
|
|
return (
|
|
<div className="h-full min-h-0 flex flex-col gap-1">
|
|
<div className="flex-1 min-h-0">{topPanel}</div>
|
|
<div className="h-12 border border-border/70 rounded-lg bg-card flex items-center justify-between px-3 border-l-0 mt-[2px]">
|
|
<Tabs
|
|
value={terminalTabValue}
|
|
onValueChange={(value) => {
|
|
if (value === 'commands') {
|
|
setActiveTerminalId(0);
|
|
return;
|
|
}
|
|
const parsed = Number(value.replace('terminal-', ''));
|
|
if (!Number.isNaN(parsed)) {
|
|
setActiveTerminalId(parsed);
|
|
}
|
|
}}
|
|
className="flex-1 min-h-0"
|
|
>
|
|
<TabsList>
|
|
<TabsTrigger value="commands" className="cursor-pointer">
|
|
Commands
|
|
</TabsTrigger>
|
|
{terminalIds.map((id) => (
|
|
<TabsTrigger key={id} value={`terminal-${id}`} className="cursor-pointer">
|
|
{id === 1 ? 'Terminal' : `Terminal ${id}`}
|
|
</TabsTrigger>
|
|
))}
|
|
<TabsTrigger value="add" onClick={addTerminal} className="cursor-pointer">
|
|
+
|
|
</TabsTrigger>
|
|
</TabsList>
|
|
</Tabs>
|
|
<button
|
|
type="button"
|
|
className="text-muted-foreground hover:text-foreground cursor-pointer"
|
|
onClick={() => setIsBottomCollapsed(false)}
|
|
>
|
|
<IconChevronUp className="h-4 w-4" />
|
|
</button>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<ResizablePanelGroup
|
|
direction="vertical"
|
|
className="h-full"
|
|
onLayout={(sizes) => {
|
|
setRightLayout(sizes as [number, number]);
|
|
setLocalStorage('task-layout-right', sizes);
|
|
}}
|
|
>
|
|
<ResizablePanel defaultSize={rightLayout[0]} minSize={30}>
|
|
{topPanel}
|
|
</ResizablePanel>
|
|
<ResizableHandle className="h-px" />
|
|
<ResizablePanel defaultSize={rightLayout[1]} minSize={20}>
|
|
<div className="h-full min-h-0 bg-card p-4 flex flex-col rounded-lg border border-border/70 border-l-0 mt-[5px]">
|
|
<Tabs
|
|
value={terminalTabValue}
|
|
onValueChange={(value) => {
|
|
if (value === 'commands') {
|
|
setActiveTerminalId(0);
|
|
return;
|
|
}
|
|
const parsed = Number(value.replace('terminal-', ''));
|
|
if (!Number.isNaN(parsed)) {
|
|
setActiveTerminalId(parsed);
|
|
}
|
|
}}
|
|
className="flex-1 min-h-0"
|
|
>
|
|
<div className="flex items-center justify-between mb-3">
|
|
<TabsList>
|
|
<TabsTrigger value="commands" className="cursor-pointer">
|
|
Commands
|
|
</TabsTrigger>
|
|
{terminalIds.map((id) => (
|
|
<TabsTrigger
|
|
key={id}
|
|
value={`terminal-${id}`}
|
|
className="group flex items-center gap-1 pr-1 cursor-pointer"
|
|
>
|
|
{id === 1 ? 'Terminal' : `Terminal ${id}`}
|
|
{terminalIds.length > 1 && (
|
|
<span
|
|
role="button"
|
|
tabIndex={-1}
|
|
className="text-muted-foreground opacity-0 group-hover:opacity-100 hover:text-foreground"
|
|
onClick={(event) => {
|
|
event.preventDefault();
|
|
event.stopPropagation();
|
|
removeTerminal(id);
|
|
}}
|
|
>
|
|
<IconX className="h-3.5 w-3.5" />
|
|
</span>
|
|
)}
|
|
</TabsTrigger>
|
|
))}
|
|
<TabsTrigger value="add" onClick={addTerminal} className="cursor-pointer">
|
|
+
|
|
</TabsTrigger>
|
|
</TabsList>
|
|
<button
|
|
type="button"
|
|
className="text-muted-foreground hover:text-foreground cursor-pointer"
|
|
onClick={() => setIsBottomCollapsed(true)}
|
|
>
|
|
<IconChevronDown className="h-4 w-4" />
|
|
</button>
|
|
</div>
|
|
<TabsContent value="commands" className="flex-1 min-h-0">
|
|
<div className="flex-1 min-h-0 overflow-y-auto rounded-lg bg-background p-3 space-y-3 h-full">
|
|
<div className="grid gap-2">
|
|
{COMMANDS.map((command) => (
|
|
<button
|
|
key={command.id}
|
|
type="button"
|
|
className="flex items-center justify-between rounded-md border border-border px-3 py-2 text-sm text-left hover:bg-muted"
|
|
>
|
|
<span>{command.label}</span>
|
|
<Badge variant="secondary">Run</Badge>
|
|
</button>
|
|
))}
|
|
</div>
|
|
</div>
|
|
</TabsContent>
|
|
{terminalIds.map((id) => (
|
|
<TabsContent key={id} value={`terminal-${id}`} className="flex-1 min-h-0">
|
|
<div className="flex-1 min-h-0 h-full p-1">
|
|
<ShellTerminal taskId={taskId} sessionId={sessionId} />
|
|
</div>
|
|
</TabsContent>
|
|
))}
|
|
</Tabs>
|
|
</div>
|
|
</ResizablePanel>
|
|
</ResizablePanelGroup>
|
|
);
|
|
});
|
|
|
|
export { TaskRightPanel };
|