CalvinBackup/shannon
1
0
Fork 0
mirror of https://github.com/KeygraphHQ/shannon.git synced 2026-05-22 16:49:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use session.json for workflow ID on resume instead of parsing workflow.log

Browse Source 
On resume, workflow.log already exists with stale headers from the
previous run. The CLI poll found '====' immediately and extracted the
old workflow ID, producing a wrong Temporal Web UI URL.

Read the workflow ID from session.json instead — the worker writes
resume attempts there atomically. For fresh runs, poll until
originalWorkflowId appears. For resumes, poll until a new
resumeAttempts entry is appended.
This commit is contained in:
ezl-keygraph
2026-03-17 19:38:16 +05:30
parent 6860c56f42
commit 916a085d79
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/cli/src/commands/start.ts
+26 -10
View File
@@ -103,15 +103,26 @@ export async function start(args: StartArgs): Promise<void> {
...(args.pipelineTesting && { pipelineTesting: true }),
});
// 14. Wait for workflow.log to appear, then display info
const workflowLog = path.join(workspacesDir, workspace, 'workflow.log');
// 14. Wait for workflow to register, then display info
proc.on('error', (err) => {
console.error(`Failed to start worker: ${err.message}`);
process.exit(1);
});
// Poll for workflow.log header
// Detect whether this is a fresh workspace or a resume by checking session.json existence
const sessionJson = path.join(workspacesDir, workspace, 'session.json');
const isResume = fs.existsSync(sessionJson);
let initialResumeCount = 0;
if (isResume) {
try {
const session = JSON.parse(fs.readFileSync(sessionJson, 'utf-8'));
initialResumeCount = session.session?.resumeAttempts?.length ?? 0;
} catch {
// Corrupted file — worker will handle validation
}
}
// Poll for workflow to register in session.json
process.stdout.write('Waiting for workflow to start...');
let workflowId = '';
let started = false;
@@ -126,15 +137,20 @@ export async function start(args: StartArgs): Promise<void> {
}
try {
const content = fs.readFileSync(workflowLog, 'utf-8');
if (content.includes('====')) {
const session = JSON.parse(fs.readFileSync(sessionJson, 'utf-8'));
const resumeAttempts: { workflowId: string }[] = session.session?.resumeAttempts ?? [];
// Fresh: session.json appears with originalWorkflowId. Resume: new resumeAttempts entry.
const ready = isResume
? resumeAttempts.length > initialResumeCount
: !!session.session?.originalWorkflowId;
if (ready) {
clearInterval(pollInterval);
started = true;
// Extract workflow ID (use latest resumed workflow ID, or original for fresh scans)
const resumeMatches = [...content.matchAll(/^New Workflow ID:\s+(.+)$/gm)];
const originalMatch = /^Workflow ID: (.+)$/m.exec(content);
workflowId = resumeMatches.at(-1)?.[1] ?? originalMatch?.[1] ?? '';
// Latest workflow ID: last resume attempt, or originalWorkflowId for fresh scans
workflowId = resumeAttempts.at(-1)?.workflowId ?? session.session?.originalWorkflowId ?? '';
// Clear waiting line and show info
process.stdout.write('\r\x1b[K');