wushenghua/hapi
1
0
Fork 0
mirror of https://github.com/wu736139669/hapi.git synced 2026-08-05 06:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: extract session and loop logic into reusable agent base classes

Browse Source
This commit is contained in:
weishu
2025-12-22 23:12:24 +08:00
parent aef3ed367b
commit 360e3a9919
6 changed files with 196 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/claude/loop.ts
+10 -35
View File
@@ -1,6 +1,7 @@
import { ApiSessionClient } from "@/api/apiSession"
import { MessageQueue2 } from "@/utils/MessageQueue2"
import { logger } from "@/ui/logger"
import { runLocalRemoteLoop } from "@/agent/loopBase"
import { Session } from "./session"
import { claudeLocalLauncher } from "./claudeLocalLauncher"
import { claudeRemoteLauncher } from "./claudeRemoteLauncher"
@@ -49,7 +50,8 @@ export async function loop(opts: LoopOptions) {
logPath: logPath,
messageQueue: opts.messageQueue,
allowedTools: opts.allowedTools,
onModeChange: opts.onModeChange
onModeChange: opts.onModeChange,
mode: opts.startingMode
});
// Notify that session is ready
@@ -57,38 +59,11 @@ export async function loop(opts: LoopOptions) {
opts.onSessionReady(session);
}
let mode: 'local' | 'remote' = opts.startingMode ?? 'local';
while (true) {
logger.debug(`[loop] Iteration with mode: ${mode}`);
// Run local mode if applicable
if (mode === 'local') {
let reason = await claudeLocalLauncher(session);
if (reason === 'exit') { // Normal exit - Exit loop
return;
}
// Non "exit" reason means we need to switch to remote mode
mode = 'remote';
if (opts.onModeChange) {
opts.onModeChange(mode);
}
continue;
}
// Start remote mode
if (mode === 'remote') {
let reason = await claudeRemoteLauncher(session);
if (reason === 'exit') { // Normal exit - Exit loop
return;
}
// Non "exit" reason means we need to switch to local mode
mode = 'local';
if (opts.onModeChange) {
opts.onModeChange(mode);
}
continue;
}
}
await runLocalRemoteLoop({
session,
startingMode: opts.startingMode,
logTag: 'loop',
runLocal: claudeLocalLauncher,
runRemote: claudeRemoteLauncher
});
}
cli/src/claude/session.ts
+41 -67
View File
@@ -1,76 +1,50 @@
import { ApiClient, ApiSessionClient } from "@/lib";
import { MessageQueue2 } from "@/utils/MessageQueue2";
import { EnhancedMode } from "./loop";
import { logger } from "@/ui/logger";
import { ApiClient, ApiSessionClient } from '@/lib';
import { MessageQueue2 } from '@/utils/MessageQueue2';
import { logger } from '@/ui/logger';
import { AgentSessionBase } from '@/agent/sessionBase';
import type { EnhancedMode } from './loop';
export class Session {
readonly path: string;
readonly logPath: string;
readonly api: ApiClient;
readonly client: ApiSessionClient;
readonly queue: MessageQueue2<EnhancedMode>;
export class Session extends AgentSessionBase<EnhancedMode> {
readonly claudeEnvVars?: Record<string, string>;
claudeArgs?: string[]; // Made mutable to allow filtering
claudeArgs?: string[];
readonly mcpServers: Record<string, any>;
readonly allowedTools?: string[];
readonly _onModeChange: (mode: 'local' | 'remote') => void;
sessionId: string | null;
mode: 'local' | 'remote' = 'local';
thinking: boolean = false;
constructor(opts: {
api: ApiClient,
client: ApiSessionClient,
path: string,
logPath: string,
sessionId: string | null,
claudeEnvVars?: Record<string, string>,
claudeArgs?: string[],
mcpServers: Record<string, any>,
messageQueue: MessageQueue2<EnhancedMode>,
onModeChange: (mode: 'local' | 'remote') => void,
allowedTools?: string[],
api: ApiClient;
client: ApiSessionClient;
path: string;
logPath: string;
sessionId: string | null;
claudeEnvVars?: Record<string, string>;
claudeArgs?: string[];
mcpServers: Record<string, any>;
messageQueue: MessageQueue2<EnhancedMode>;
onModeChange: (mode: 'local' | 'remote') => void;
allowedTools?: string[];
mode?: 'local' | 'remote';
}) {
this.path = opts.path;
this.api = opts.api;
this.client = opts.client;
this.logPath = opts.logPath;
this.sessionId = opts.sessionId;
this.queue = opts.messageQueue;
super({
api: opts.api,
client: opts.client,
path: opts.path,
logPath: opts.logPath,
sessionId: opts.sessionId,
messageQueue: opts.messageQueue,
onModeChange: opts.onModeChange,
mode: opts.mode,
sessionLabel: 'Session',
sessionIdLabel: 'Claude Code',
applySessionIdToMetadata: (metadata, sessionId) => ({
...metadata,
claudeSessionId: sessionId
})
});
this.claudeEnvVars = opts.claudeEnvVars;
this.claudeArgs = opts.claudeArgs;
this.mcpServers = opts.mcpServers;
this.allowedTools = opts.allowedTools;
this._onModeChange = opts.onModeChange;
// Start keep alive
this.client.keepAlive(this.thinking, this.mode);
setInterval(() => {
this.client.keepAlive(this.thinking, this.mode);
}, 2000);
}
onThinkingChange = (thinking: boolean) => {
this.thinking = thinking;
this.client.keepAlive(thinking, this.mode);
}
onModeChange = (mode: 'local' | 'remote') => {
this.mode = mode;
this.client.keepAlive(this.thinking, mode);
this._onModeChange(mode);
}
onSessionFound = (sessionId: string) => {
this.sessionId = sessionId;
// Update metadata with Claude Code session ID
this.client.updateMetadata((metadata) => ({
...metadata,
claudeSessionId: sessionId
}));
logger.debug(`[Session] Claude Code session ID ${sessionId} added to metadata`);
}
/**
@@ -79,7 +53,7 @@ export class Session {
clearSessionId = (): void => {
this.sessionId = null;
logger.debug('[Session] Session ID cleared');
}
};
/**
* Consume one-time Claude flags from claudeArgs after Claude spawn
@@ -87,7 +61,7 @@ export class Session {
*/
consumeOneTimeFlags = (): void => {
if (!this.claudeArgs) return;
const filteredArgs: string[] = [];
for (let i = 0; i < this.claudeArgs.length; i++) {
if (this.claudeArgs[i] === '--resume') {
@@ -111,8 +85,8 @@ export class Session {
filteredArgs.push(this.claudeArgs[i]);
}
}
this.claudeArgs = filteredArgs.length > 0 ? filteredArgs : undefined;
logger.debug(`[Session] Consumed one-time flags, remaining args:`, this.claudeArgs);
}
}
};
}