refactor: unify env vars (UWF_HOME, OCAS_HOME) + env only in CLI (#37)
CI / check (pull_request) Failing after 3m6s

Breaking changes:
- UWF_STORAGE_ROOT → UWF_HOME
- WORKFLOW_STORAGE_ROOT removed (no fallback)
- OCAS_DIR → OCAS_HOME (aligned with ocas CLI)

Library functions no longer read process.env:
- util-agent/storage.ts: resolveStorageRoot(override), getGlobalCasDir(override)
- agent-hermes: isResumeDisabled(flag) pure function, CLI reads env
- agent-claude-code: CLI reads CLAUDE_MODEL and passes to agent

Fixes #37
This commit is contained in:
2026-06-04 05:12:05 +00:00
parent 84bdd81317
commit 6b7636b088
45 changed files with 394 additions and 333 deletions
+38 -15
View File
@@ -17,7 +17,6 @@ const log = createLogger({ sink: { kind: "stderr" } });
const CLAUDE_COMMAND = "claude";
const CLAUDE_MAX_TURNS = 90;
const CLAUDE_MODEL = process.env.CLAUDE_MODEL ?? null;
/** Assemble system prompt, task, and prior step outputs for Claude Code. */
export function buildClaudeCodePrompt(ctx: AgentContext): string {
@@ -85,6 +84,7 @@ function spawnClaude(
function spawnClaudeRun(
prompt: string,
model: string | null,
): Promise<{ stdout: string; stderr: string; exitCode: number | null }> {
const args = [
"-p",
@@ -96,8 +96,8 @@ function spawnClaudeRun(
"--max-turns",
String(CLAUDE_MAX_TURNS),
];
if (CLAUDE_MODEL !== null) {
args.push("--model", CLAUDE_MODEL);
if (model !== null) {
args.push("--model", model);
}
return spawnClaude(args);
}
@@ -105,6 +105,7 @@ function spawnClaudeRun(
function spawnClaudeResume(
sessionId: string,
message: string,
model: string | null,
): Promise<{ stdout: string; stderr: string; exitCode: number | null }> {
const args = [
"-p",
@@ -118,8 +119,8 @@ function spawnClaudeResume(
"--max-turns",
String(CLAUDE_MAX_TURNS),
];
if (CLAUDE_MODEL !== null) {
args.push("--model", CLAUDE_MODEL);
if (model !== null) {
args.push("--model", model);
}
return spawnClaude(args);
}
@@ -157,20 +158,35 @@ async function processClaudeOutput(
);
}
async function runClaudeCode(ctx: AgentContext): Promise<AgentRunResult> {
async function runClaudeCode(ctx: AgentContext, model: string | null): Promise<AgentRunResult> {
const fullPrompt = buildClaudeCodePrompt(ctx);
log("K7R2M4N8", `prompt for role=${ctx.role} (length=${fullPrompt.length}):\n${fullPrompt}`);
// Try resuming a cached session for re-entry scenarios (e.g. reviewer reject → developer re-entry).
if (!ctx.isFirstVisit) {
const cachedSessionId = await getCachedSessionId("claude-code", ctx.threadId, ctx.role);
const cachedSessionId = await getCachedSessionId(
"claude-code",
ctx.threadId,
ctx.role,
ctx.storageRoot,
);
if (cachedSessionId !== null) {
try {
const { stdout, stderr, exitCode } = await spawnClaudeResume(cachedSessionId, fullPrompt);
const { stdout, stderr, exitCode } = await spawnClaudeResume(
cachedSessionId,
fullPrompt,
model,
);
const result = await processClaudeOutput(stdout, stderr, exitCode, ctx.store, fullPrompt);
if (result.sessionId !== undefined && result.sessionId !== "") {
await setCachedSessionId("claude-code", ctx.threadId, ctx.role, result.sessionId);
await setCachedSessionId(
"claude-code",
ctx.threadId,
ctx.role,
result.sessionId,
ctx.storageRoot,
);
}
return result;
} catch (err) {
@@ -182,10 +198,16 @@ async function runClaudeCode(ctx: AgentContext): Promise<AgentRunResult> {
}
}
const { stdout, stderr, exitCode } = await spawnClaudeRun(fullPrompt);
const { stdout, stderr, exitCode } = await spawnClaudeRun(fullPrompt, model);
const result = await processClaudeOutput(stdout, stderr, exitCode, ctx.store, fullPrompt);
if (result.sessionId !== undefined && result.sessionId !== "") {
await setCachedSessionId("claude-code", ctx.threadId, ctx.role, result.sessionId);
await setCachedSessionId(
"claude-code",
ctx.threadId,
ctx.role,
result.sessionId,
ctx.storageRoot,
);
}
return result;
}
@@ -194,16 +216,17 @@ async function continueClaudeCode(
sessionId: string,
message: string,
store: Store,
model: string | null,
): Promise<AgentRunResult> {
const { stdout, stderr, exitCode } = await spawnClaudeResume(sessionId, message);
const { stdout, stderr, exitCode } = await spawnClaudeResume(sessionId, message, model);
return processClaudeOutput(stdout, stderr, exitCode, store, "");
}
/** Agent CLI factory: parses argv, runs Claude Code, extracts output, writes StepNode. */
export function createClaudeCodeAgent(): () => Promise<void> {
export function createClaudeCodeAgent(model: string | null): () => Promise<void> {
return createAgent({
name: "claude-code",
run: runClaudeCode,
continue: continueClaudeCode,
run: (ctx) => runClaudeCode(ctx, model),
continue: (sessionId, message, store) => continueClaudeCode(sessionId, message, store, model),
});
}
+2 -1
View File
@@ -2,5 +2,6 @@
import { createClaudeCodeAgent } from "./claude-code.js";
const main = createClaudeCodeAgent();
const model = process.env.CLAUDE_MODEL ?? null;
const main = createClaudeCodeAgent(model);
void main();