Skip to content

feat(orchestrator): auto-reset stale Claude SDK sessions + bare 'reset' command for Slack#1121

Open
mhooooo wants to merge 1 commit into
coleam00:devfrom
mhooooo:feat/stale-session-auto-reset
Open

feat(orchestrator): auto-reset stale Claude SDK sessions + bare 'reset' command for Slack#1121
mhooooo wants to merge 1 commit into
coleam00:devfrom
mhooooo:feat/stale-session-auto-reset

Conversation

@mhooooo

@mhooooo mhooooo commented Apr 12, 2026

Copy link
Copy Markdown

Summary

When the Claude Code SDK rejects a resume attempt with No conversation found or conversation not found (stale session ID), the orchestrator currently surfaces this as a retryable crash class error and eventually propagates it to the user, who then has to manually /reset and retry their message. This PR makes the orchestrator detect the stale-session error class, auto-reset the session transparently, and retry the query once with a fresh session ID — so the user never sees the interruption.

Also accepts bare reset without the leading slash on Slack. Slack intercepts /reset as its own built-in command, so users on Slack couldn't use the text slash-command to reset their Archon session.

Motivation

Running Archon as a long-lived personal assistant (heartbeat + Slack DM + multi-day conversations), the SDK occasionally loses session state — the assistant_session_id becomes stale, the next query fails, and the conversation is effectively dead until the user notices and manually resets. Auto-reset turns a visible failure into a 0.5s hiccup.

Changes

packages/core/src/clients/claude.ts

  • Export STALE_SESSION_PATTERNS as a single source of truth
  • Extend classifySubprocessError() to include 'stale_session'
  • Check stale_session before crash (specific wins over generic)

packages/core/src/state/session-transitions.ts

  • New 'stale-session-cleared' trigger

packages/core/src/orchestrator/orchestrator-agent.ts

  • isStaleSessionError() helper using shared patterns
  • Stream + batch handlers wrap AI-query in retry-once on stale session
  • State cleared before retry (no partial content bleed)
  • SLACK_BARE_COMMANDS normalization (Slack-only)

Tests

  • classifySubprocessError tests for stale-session patterns (case-insensitive, both paths)
  • Priority: overlapping crash + stale_session → stale_session wins
  • Stream + batch: successful reset + retry, no-third-retry guard, skip on fresh session
  • Bare command normalization: reset/reset, Slack-only

Scope

  • Claude only (not codex)
  • One retry max
  • Bare-command normalization scoped to Slack

Carried forward from dynamous-community/remote-coding-agent @ v0.2.12 (commit 229217cf). Rebased onto latest main. Happy to split into two PRs if preferred.

Test plan

  • bun run type-check — clean
  • bun test packages/core/src/clients/claude.test.ts
  • bun test packages/core/src/orchestrator/orchestrator.test.ts
  • Manual: trigger stale-session error → verify auto-recovery
  • Manual: bare reset on Slack → treated as /reset

…lack

When the Claude Code SDK rejects a resume attempt with "No conversation
found" (the SDK session ID is gone), the orchestrator now transparently
resets the session and retries the query instead of surfacing an error
that the user has to /reset manually.

Also accepts bare 'reset' without the leading slash on Slack, since Slack
intercepts /reset as its own slash command.

Changes:
- claude.ts: classify stale_session as a non-retryable error class
  (checked before 'crash' — specific wins over generic); export
  STALE_SESSION_PATTERNS as the single source of truth for both the
  classifier and the orchestrator's isStaleSessionError() helper
- session-transitions.ts: new 'stale-session-cleared' transition
  (deactivates — next message creates a fresh session)
- orchestrator-agent.ts: isStaleSessionError() helper; SLACK_BARE_COMMANDS
  normalization scoped to Slack platform only; handleStreamMode and
  handleBatchMode wrap their AI query loops in runStreamQuery() /
  runBatchQuery() functions so a catch block can reset sessionForQuery
  and re-run with the fresh session ID; state reset before retry
  (allMessages/allChunks/assistantMessages/commandDetected) so partial
  content from the failed attempt never bleeds into the fresh response
- claude.test.ts: stale_session classification tests, including priority
  over 'crash' on overlapping error messages, and .cause assertions
- orchestrator.test.ts: parameterized stream/batch retry tests covering
  successful reset+retry, no-third-retry guard, null-session skip, and
  fresh session ID assertion on retry

Ported from the dynamous/remote-coding-agent fork (commit 229217cf) with
the following intentional deltas against the new v0.3.5 base:
- Dropped defaultCodebase auto-scoping block (Patch 1 not carried —
  CONFIG-REPLACEABLE per investigation verdict)
- Slack bare-command normalization scoped to Slack platform only
  (fork shipped unscoped initially; this change came in a later
  review-findings sub-commit)
- runStreamQuery/runBatchQuery keep upstream's 4-arg aiClient.sendQuery
  signature including requestOptions (fork was on pre-v0.3.2 3-arg shape)
- Upstream deterministic command list preserved (help, status, reset,
  workflow, register-project, update-project, remove-project, commands,
  init, worktree) — fork only had 5
- No CHANGELOG / bun.lock / package.json / docs changes — those will
  be rebuilt on top of the v0.3.5 base

Upstream-PR candidate for coleam00/Archon.
@coderabbitai

coderabbitai Bot commented Apr 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 5b0c1f56-b2d4-49d0-a474-16a6b86c57cb

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@Wirasm

Wirasm commented Apr 17, 2026

Copy link
Copy Markdown
Collaborator

Related to #1208 — overlapping area or partial fix.

@coleam00

Copy link
Copy Markdown
Owner

Scope note — this PR does not fix #1208

PR #1121 is a solid fix for the orchestrator chat path's stale-session problem and worth merging on its own merits. But to set expectations cleanly, it should not be framed as the fix for #1208. Three concrete gaps prevent it from reaching that failure mode.

1. Different layer

PR #1121's retry wrapper lives in orchestrator-agent.ts (handleStreamMode / handleBatchMode), which is called by handleMessage for Slack/Web/Telegram chat.

dag-executor.ts (workflow loops — where #1208's archon-piv-loop crashes) invokes the provider directly. It never calls handleMessage. The retry try/catch in this PR does not execute on that path.

2. Different error delivery shape

PR #1121 catches thrown errors. The #1208 failure arrives as a yielded result message with isError: true, errorSubtype: 'error_during_execution' (packages/providers/src/claude/provider.ts:754-774). No exception is thrown, so the try/catch wrapper never fires.

For reference, dag-executor.ts:757 only handles isError when errorSubtype === 'error_max_budget_usd'. All other subtypes — including error_during_executionbreak silently at line 767 with whatever partial output accumulated. That matches the "5–7 second crash" symptom in #1208: fast-failing iteration produces empty output, loop continues.

3. Different pattern match

STALE_SESSION_PATTERNS = ['no conversation found', 'conversation not found']. The string 'error_during_execution' matches neither. Even if it did throw, isStaleSessionError() would return false.

Independent evidence that #1208 is not a stale-session rejection

  • Cross-process session resume works (verified with a two-process test, separate PIDs, session ID handed off — magic word recalled successfully).
  • Invalid session UUIDs produce "No conversation found with session ID: ..." (thrown), not error_during_execution (yielded result).
  • The reporter's logs show two different session IDs between resuming_session and result_is_error — the SDK allocated a new session successfully; failure happened during that session's execution, not during resume handshake.

Suggested framing

Keep this PR focused on the orchestrator chat path. If you want to address #1208 with the same pattern, it's a separate change in dag-executor.ts around the msg.isError handling at line 757, not a throw/catch wrapper — and the retryable subtypes / detection logic is a different design question (still analyzing that).

coleam00 added a commit that referenced this pull request Apr 18, 2026
Previously, `dag-executor` only failed nodes/iterations when the SDK
returned an `error_max_budget_usd` result. Every other `isError: true`
subtype — including `error_during_execution` — was silently `break`ed
out of the stream with whatever partial output had accumulated, letting
failed runs masquerade as successful ones with empty output.

This is the most likely explanation for the "5-second crash" symptom in
#1208: iterations finish instantly with empty text, the loop keeps
going, and only the `claude.result_is_error` log tips the user off.

Changes:
- Capture the SDK's `errors: string[]` detail on result messages
  (previously discarded) and surface it through `MessageChunk.errors`.
- Log `errors`, `stopReason` alongside `errorSubtype` in
  `claude.result_is_error` so users can see what actually failed.
- Throw from both the general node path and the loop iteration path
  on any `isError: true` result, including the subtype and SDK errors
  detail in the thrown message.

Note: this does not implement auto-retry. See PR comments on #1121 and
the analysis on #1208 — a retry-with-fresh-session approach for loop
iterations is not obviously correct until we see what
`error_during_execution` actually carries in the reporter's env.
This change is the observability + fail-loud step that has to come
first so that signal is no longer silent.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@coleam00

Copy link
Copy Markdown
Owner

Archon PR Validation Report

Verdict: REQUEST_CHANGES

Summary

Both claimed bugs are confirmed on main — stale Claude SDK sessions surface as cryptic errors with no auto-recovery, and Slack intercepts /reset leaving Slack users stuck. The fix design is architecturally sound (client-level detection, orchestrator-level retry-once with session transition). However, three issues must be addressed before merge.

Bug Confirmation

Claim Main Feature
Stale session errors require manual /reset Confirmed Fixed (auto-reset + retry-once)
Slack intercepts /reset Confirmed Fixed (bare reset normalization)

Required Changes

  1. Retarget PR to dev — Per project git workflow, all feature work merges into dev, not main.

  2. Rebase onto current dev — PR is based on an old main snapshot. Current dev has diverged with:

    • isError handling in batch/stream result events (will be silently lost on merge)
    • Type rename: AssistantRequestOptionsSendQueryOptions
    • Import path changes to @archon/providers/types
  3. Fix approval routing bugorchestrator-agent.ts:551 uses message.startsWith('/') instead of effectiveMessage.startsWith('/'). On Slack, bare reset during a workflow approval gate gets treated as approval text instead of the /reset command.

What's Done Well

  • Correct separation of concerns (detect at client, retry at orchestrator)
  • Triple retry guard prevents infinite loops
  • Shared STALE_SESSION_PATTERNS constant — single source of truth
  • Comprehensive test coverage across stream and batch modes

Fix Quality Score: 3.6/5


Validated by archon-validate-pr workflow

@coleam00 coleam00 changed the base branch from main to dev April 18, 2026 19:18
@coleam00

Copy link
Copy Markdown
Owner

Thanks for this PR — after running archon-validate-pr and a manual review, the bug analysis and fix design are solid. Both issues are confirmed on current main: classifySubprocessError() has no stale_session class, and Slack users can't send /reset. The client-level detection + orchestrator-level retry-once split is the right shape.

I did what I could from the maintainer side and needs the rest from you:

✅ Done by maintainer

Retargeted this PR's base from maindev. Per CLAUDE.md, all feature work merges into dev; main is a release-only branch. No action needed from you on this.

❌ Needs a rebase (not a simple git rebase)

This PR was written against main (~v0.3.6), but dev has undergone a package split that moves every file this PR touches. I tried a straight rebase and it hit a structural conflict — the old paths literally don't exist anymore. You'll need to port the changes to the new locations.

What moved on dev:

In this PR (old main) On current dev
packages/core/src/clients/claude.ts packages/providers/src/claude/provider.ts
packages/core/src/clients/claude.test.ts packages/providers/src/claude/provider.test.ts
IAssistantClient interface IAgentProvider interface
aiClient.sendQuery(...) (in orchestrator) provider.sendQuery(...)
monolithic sendQuery body decomposed into helpers (see #1162)

Porting guide for your three buckets of changes:

  1. STALE_SESSION_PATTERNS + classifySubprocessError changes — port to packages/providers/src/claude/provider.ts. The classifier still exists there (around line 111) with the same signature. Just add the stale_session branch and the exported patterns constant. Note there's now a classifyAndEnrichError() wrapper helper (around line 810) that builds the enriched error + shouldRetry; plug stale_session in there as non-retryable, same shape as the existing auth branch. Export from @archon/providers so the orchestrator can import it.

  2. classifySubprocessError tests — port to packages/providers/src/claude/provider.test.ts. The test file structure is similar enough that most assertions transfer directly.

  3. Orchestrator changes (orchestrator-agent.ts, orchestrator.test.ts, session-transitions.ts)session-transitions.ts should merge cleanly (just add 'stale-session-cleared'). The orchestrator has diverged ~279 lines, so handleStreamMode / handleBatchMode will need manual re-application of your runStreamQuery/runBatchQuery retry pattern against the current shape. Preserve the existing isError handling that now lives in those functions — don't drop it when you re-apply your changes.

🐛 One more bug to fix while you're in there

orchestrator-agent.ts:552 (on your branch) — the approval-routing gate uses the raw message instead of effectiveMessage:

// Current (bug):
if (!message.startsWith('/')) {
  const pausedRun = await workflowDb.getPausedWorkflowRun(conversation.id);
  ...
}

// Fix:
if (!effectiveMessage.startsWith('/')) {
  const pausedRun = await workflowDb.getPausedWorkflowRun(conversation.id);
  ...
}

Scenario this protects against: a Slack user has a paused interactive workflow, types reset (bare) to get out. Your normalization correctly rewrites it to /reset in effectiveMessage, but this gate still sees the raw reset (no slash), routes into the natural-language-approval path, stores reset as the approval response, and the user is stuck. The fix is a one-token change.

Same nit applies lower down in handleUpdateProject/handleRemoveProject call sites — those pass message but probably want effectiveMessage too, for consistency. Lower priority.

Summary

  • Base retarget: done ✅
  • Rebase-as-port + approval bug fix: needs you 👇
  • Design review: all green 👍 — this is a real bug, and the fix approach is correct. Just needs the new-architecture re-spelling.

Once you push the ported version, I'll re-run validation.

coleam00 added a commit that referenced this pull request Apr 18, 2026
Previously, `dag-executor` only failed nodes/iterations when the SDK
returned an `error_max_budget_usd` result. Every other `isError: true`
subtype — including `error_during_execution` — was silently `break`ed
out of the stream with whatever partial output had accumulated, letting
failed runs masquerade as successful ones with empty output.

This is the most likely explanation for the "5-second crash" symptom in
#1208: iterations finish instantly with empty text, the loop keeps
going, and only the `claude.result_is_error` log tips the user off.

Changes:
- Capture the SDK's `errors: string[]` detail on result messages
  (previously discarded) and surface it through `MessageChunk.errors`.
- Log `errors`, `stopReason` alongside `errorSubtype` in
  `claude.result_is_error` so users can see what actually failed.
- Throw from both the general node path and the loop iteration path
  on any `isError: true` result, including the subtype and SDK errors
  detail in the thrown message.

Note: this does not implement auto-retry. See PR comments on #1121 and
the analysis on #1208 — a retry-with-fresh-session approach for loop
iterations is not obviously correct until we see what
`error_during_execution` actually carries in the reporter's env.
This change is the observability + fail-loud step that has to come
first so that signal is no longer silent.

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
@Wirasm

Wirasm commented Apr 20, 2026

Copy link
Copy Markdown
Collaborator

@mhooooo — quick ping. The design review is done and green; the last open item is the port to the new architecture. Here's the short checklist so there's no ambiguity about what would unblock merge:

Required to proceed

  1. Rebase onto current dev (already retargeted from main for you). Note that straight git rebase dev will hit structural conflicts because packages/core/src/clients/claude.ts has moved. Use @coleam00's porting guide (comment here) — it maps every old path/type to its new home.

  2. Re-apply your three changes in the new locations:

    • STALE_SESSION_PATTERNS + classifySubprocessError stale_session branch → packages/providers/src/claude/provider.ts (classifier is ~line 111; plug into classifyAndEnrichError() ~line 810 as non-retryable, same shape as the auth branch). Export the constant from @archon/providers.
    • classifySubprocessError tests → packages/providers/src/claude/provider.test.ts.
    • session-transitions.ts 'stale-session-cleared' trigger → merges cleanly.
    • orchestrator-agent.ts runStreamQuery/runBatchQuery retry wrappers → re-apply against the current shape. Important: preserve the isError handling that now lives in those functions — don't drop it when you re-apply.
  3. Fix the approval-routing bug at orchestrator-agent.ts:552 — use effectiveMessage.startsWith('/') instead of message.startsWith('/'). Without this, your own Slack-bare-reset normalization doesn't reach the approval gate correctly.

  4. Drop homebrew/archon.rb from the diff — that version bump and the SHAs are a merge artifact from the old main base; rebasing onto dev will naturally drop it.

Out of scope for this PR (confirmed by Cole's analysis): #1208 is not fixed by this change — different code path (dag-executor, not orchestrator-agent), different error shape (yielded isError, not thrown). Please don't broaden scope to try to address it here.

Timeline

If you can push the ported version within the next ~5 days, we'll merge as soon as validation is green. If that's not feasible for you, let us know and we'll pick it up ourselves using Cole's porting guide as the spec — we'd still credit you via Co-authored-by: on the commits.

Thanks for the clean design and the thorough tests — the bug analysis and the architectural split (client detects, orchestrator retries once) is exactly right.

@leex279

leex279 commented May 4, 2026

Copy link
Copy Markdown
Collaborator

🔗 Related issue: This PR may be related to issue #1208 ("interactive loop resume crashes with error_during_execution (stale session)"). Both involve session state management when a Claude session becomes invalid mid-conversation.

prospapledge88 added a commit to prospapledge88/Archon that referenced this pull request May 5, 2026
* fix(workflows): fail loudly on SDK isError results (coleam00#1208) (coleam00#1291)

Previously, `dag-executor` only failed nodes/iterations when the SDK
returned an `error_max_budget_usd` result. Every other `isError: true`
subtype — including `error_during_execution` — was silently `break`ed
out of the stream with whatever partial output had accumulated, letting
failed runs masquerade as successful ones with empty output.

This is the most likely explanation for the "5-second crash" symptom in
coleam00#1208: iterations finish instantly with empty text, the loop keeps
going, and only the `claude.result_is_error` log tips the user off.

Changes:
- Capture the SDK's `errors: string[]` detail on result messages
  (previously discarded) and surface it through `MessageChunk.errors`.
- Log `errors`, `stopReason` alongside `errorSubtype` in
  `claude.result_is_error` so users can see what actually failed.
- Throw from both the general node path and the loop iteration path
  on any `isError: true` result, including the subtype and SDK errors
  detail in the thrown message.

Note: this does not implement auto-retry. See PR comments on coleam00#1121 and
the analysis on coleam00#1208 — a retry-with-fresh-session approach for loop
iterations is not obviously correct until we see what
`error_during_execution` actually carries in the reporter's env.
This change is the observability + fail-loud step that has to come
first so that signal is no longer silent.

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
(cherry picked from commit 4c6ddd9)

* fix(db): throw on corrupt commands JSON instead of silent empty fallback (coleam00#1033)

* fix(db): throw on corrupt commands JSON instead of silent empty fallback (coleam00#967)

getCodebaseCommands() silently returned {} when the commands column
contained corrupt JSON. Callers had no way to distinguish 'no commands'
from 'unreadable data', violating fail-fast principles.

Now throws a descriptive error with the codebase ID and a recovery hint.
The error is still logged for observability before throwing.

Adds two test cases: corrupt JSON throws, valid JSON string parses.

* fix: include parse error in log for better diagnostics

(cherry picked from commit 39a05b7)

* fix(isolation): raise worktree git-operation timeout to 5m (coleam00#1306)

All 15 worktree git-subprocess timeouts in WorktreeProvider were hardcoded
at 30000ms. Repos with heavy post-checkout hooks (lint, dependency install,
submodule init) routinely exceed that budget and fail worktree creation.

Consolidate them onto a single GIT_OPERATION_TIMEOUT_MS constant at 5 min.
Generous enough to cover reported cases while still catching genuine hangs
(credential prompts in non-TTY, stalled fetches).

Chosen over the config-key approach in coleam00#1029 to avoid adding permanent
.archon/config.yaml surface for a problem a raised default solves cleanly.
If 5 min turns out to also be too tight for real-world use, we'll revisit.

Closes coleam00#1119
Supersedes coleam00#1029

Co-authored-by: Shay Elmualem <12733941+norbinsh@users.noreply.github.com>
(cherry picked from commit cc78071)

* fix(web,server): show real platform connection status in Settings (coleam00#1061)

The Settings page's Platform Connections section hardcoded every platform
except Web to 'Not configured', so users couldn't tell whether their Slack/
Telegram/Discord/GitHub/Gitea/GitLab adapters had actually started.

- Server: /api/health now returns an activePlatforms array populated live
  as each adapter's start() resolves. Passed into registerApiRoutes so the
  reference stays mutable — Telegram starts after the HTTP listener is
  already accepting requests, so a snapshot would miss it.
- Web: SettingsPage.PlatformConnectionsSection now reads activePlatforms
  from /api/health and looks each platform up in a Set. Also adds Gitea
  and GitLab to the list (they already ship as adapters).

Closes coleam00#1031

Co-authored-by: Lior Franko <liorfr@dreamgroup.com>
(cherry picked from commit 08de8ee)

* fix: initialize options.hooks before merging YAML node hooks (coleam00#1177)

When a workflow node defines hooks (PreToolUse/PostToolUse) in YAML but
no hooks exist yet on the options object, applyNodeConfig crashes with
"undefined is not an object" because it tries to assign properties on
the undefined options.hooks.

Initialize options.hooks to {} before the merge loop.

Reproduces with: archon workflow run archon-architect (which uses
per-node hooks extensively).

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
(cherry picked from commit 7ea3214)

* fix: detect completion signal in any XML tag, not just <promise> (coleam00#1126) (coleam00#1184)

* fix: detect completion signal in any XML tag, not just <promise> (coleam00#1126)

Loop nodes with `until:` reported max_iterations_reached when the AI wrapped
the completion signal in XML tags other than `<promise>` (e.g.,
`<COMPLETE>ALL_CLEAN</COMPLETE>`). The three existing regex patterns all missed
this format, causing the loop to exhaust iterations and fail.

Changes:
- Add generic XML-wrapped signal pattern to `detectCompletionSignal`
- Extend `stripCompletionTags` to strip matched XML-wrapped signals from output
- Pass `loop.until` to `stripCompletionTags` call site in dag-executor
- Add unit tests for detection and stripping of XML-wrapped signals
- Add integration test for loop completing on final iteration with XML tags

Fixes coleam00#1126

* fix: address review findings for completion signal detection

- Update detectCompletionSignal JSDoc to document all three detection formats
- Update stripCompletionTags JSDoc to mention the `until` parameter
- Remove superfluous `m` flag from xmlWrappedPattern (no anchors, no effect)
- Document that XML tag names are matched independently (intentional permissiveness)
- Add test: detects signal in mismatched XML tags (permissive behavior)
- Add test: strips both <promise> and XML-tagged signal in same chunk
- Add assertion in DAG integration test that raw XML tags don't appear in sent messages

* simplify: reduce complexity in changed files

* fix: require matching XML tag names in completion-signal detection

Follow-up to the initial broadening in this PR. The first version of the
regex accepted mismatched open/close tags (e.g. `<COMPLETE>X</done>`)
which was a small false-positive surface when the AI interleaves tags
in prose. Tightens both detectCompletionSignal and stripCompletionTags
to capture the tag name and enforce it on the close via \1
backreference. Case-insensitivity on the tag name is preserved.

Test updates:
- Flip the "permissive mismatch" case to assert strict rejection with a
  comment explaining the guard.
- Add a case-insensitive matching case to lock that behavior in.

No behavior change for workflows that use matching tags (the
overwhelming common case) or for <promise>...</promise>. Behavior change
is limited to the narrow "open tag and close tag disagree" case, which
only happens when the AI is confused — in which case we'd rather report
max_iterations_reached and let the author inspect than silently call
the loop complete.

(cherry picked from commit bc25dee)

* fix(web): allow deleting nodes from Workflow Builder (coleam00#971) (coleam00#1113)

* fix(web): allow deleting nodes from Workflow Builder (coleam00#971)

Three independent gaps prevented users from deleting nodes added to the
Workflow Builder canvas: dropped nodes were never auto-selected so
keyboard shortcuts silently no-oped, no right-click context menu
existed, and the Delete Node button was buried in the Advanced tab
(hidden below the viewport for Prompt/Command, completely absent for
Bash since bash nodes have no Advanced tab).

Fixes coleam00#971.

* fix(web): push undo snapshot before adding nodes on canvas

Call onPushSnapshot() before setNodes() in both onDrop and quick-add
handlers so that node additions are captured by undo/redo history.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix(web): address PR coleam00#1113 review feedback

- Hold nodes/edges in refs so handleNodeDeleteById and onPushSnapshot
  can't capture stale pre-drop state (fixes undo-stack correctness).
- Clamp context-menu x/y to viewport so right-click near edges stays
  fully on-screen.
- Drop non-conformant role=menu/menuitem from the single-item context
  menu; rely on the native button for accessibility.
- Extend isInputTarget() to cover ARIA combobox/textbox/searchbox so
  Backspace in Radix/shadcn widgets never nukes a node.
- Extract handleBuilderKeydown as a pure function and add tests
  covering the Delete/Backspace + isInputTarget invariant.
- Remove issue-number references from code comments per CLAUDE.md.
- Document the new delete affordances in the Workflow Builder docs.
- Inline context-menu dismissal, rename pointer handler, drop unused
  deps in keyboardActions useMemo.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
(cherry picked from commit d7f36b2)

* fix(workflows): make archon-adversarial-dev sed replacement macOS-safe (coleam00#1155)

* fix(workflows): make adversarial init sed portable on macOS

* chore: regenerate bundled-defaults after adversarial-dev sed fix

Sync generated bundle with the new temp-file sed pattern in
archon-adversarial-dev.yaml so check:bundled passes and binary
distributions ship the macOS-safe version.

---------

Co-authored-by: laplace young <yangqk12@whu.edu.cn>
Co-authored-by: Rasmus Widing <rasmus.widing@gmail.com>
(cherry picked from commit 817186d)

* fix(deps): override transitive axios to ^1.15.0 for CVE-2025-62718 (coleam00#1330)

axios <1.15.0 can be coerced to bypass NO_PROXY rules via hostname
normalization, enabling SSRF in the right network shape. Archon pulls
axios transitively through @slack/bolt (^1.12.0) and @slack/web-api
(^1.13.5); before this change bun.lock resolved axios@1.13.6 — within
the vulnerable range.

Adding "axios": "^1.15.0" to the root package.json overrides bumps the
transitive resolution to axios@1.15.1 (latest compatible 1.x). Both
Slack range specs accept it without API surface changes — no downstream
code touches axios directly.

Supersedes coleam00#1153. Credits @stefans71 for identifying and reporting the
vulnerability; their PR was stale on the lockfile (0.3.5 → 0.3.6 drift
on dev), so this is a fresh one-line re-do on current dev.

Closes coleam00#1053.

Co-authored-by: Stefans71 <stefans71@users.noreply.github.com>
(cherry picked from commit ae2d936)

* fix(cli): surface stale-workspace registration error instead of fake "not a git repo" (coleam00#1332)

* fix(cli): surface stale-workspace registration error instead of fake "not a git repo"

When workflowRunCommand auto-registers an unregistered repo, a stale
~/.archon/workspaces/<owner>/<repo>/source symlink (pointing to an old
checkout) causes createProjectSourceSymlink() in @archon/paths to throw:

  Source symlink at <linkPath> already points to <existing>, expected <target>

The CLI caught that in a try/catch, logged it at warn level, continued
with `codebase = null`, and then the isolation / resume branches hit
their "codebase missing" fallback and threw the generic:

  Cannot create worktree: not in a git repository.

That message is false — the repo is valid; the Archon workspace entry
is stale. It sends users down the wrong diagnostic path (checking git
config, permissions, etc.) instead of pointing at the workspace dir.

Fix: preserve the registration error on a new `codebaseRegistrationError`
local, and at both fallback sites (resume + worktree-creation) check it
before the generic "not a git repo" branch. When set, throw a truthful:

  Cannot {create worktree,resume}: repository registration failed.
  Error: <original message>
  Hint: Remove the stale workspace entry at <dir> and retry, or
        use --no-worktree to skip isolation.

The hint's exact path comes from a small parser that extracts the
workspace directory from the known "Source symlink at …" format; when
the message shape doesn't match (future error text changes), the parser
returns null and we fall back to a generic "check registration under
<archon-home>/workspaces" hint — safe degradation.

Regression test in workflow.test.ts asserts the new error message and
negatively asserts the old "not in a git repository" string is gone.

Supersedes coleam00#1157 — that PR was draft + CONFLICTING against current dev,
and also mentioned Windows test-compat changes that weren't in the diff
(pruned scope). This is a fresh re-do focused strictly on coleam00#1146.

Closes coleam00#1146.

Co-authored-by: Bortlesboat <Bortlesboat@users.noreply.github.com>

* review: add resume-path test, null-fallback test, update troubleshooting docs

Addresses multi-agent review feedback on this PR:

- Add regression test for the --resume fallback site (the worktree-create
  site was already covered; the resume site had identical wiring but zero
  test coverage).
- Add test for the unrecognized-error-shape branch of
  buildRegistrationFailureError so the generic workspace hint is pinned
  (prevents accidental inversion of the stale-entry vs generic-hint
  ternary).
- Update the troubleshooting page to key on the new
  "Cannot create worktree: repository registration failed." message.
  Users hitting the new error won't find the page under the old heading,
  and the "In the future..." note is obsolete now that the error itself
  contains the cleanup path.
- Trim both new docblocks: keep the load-bearing cross-package error
  string contract in extractStaleWorkspaceEntry, drop narration of what
  the code already shows. Drop the "Before this helper existed..."
  paragraph from buildRegistrationFailureError — that's CHANGELOG
  material. Drop PR-reference suffix from the test section divider.

* review: guard getArchonHome in hint + export parser for direct tests

Two follow-up fixes to the multi-agent review commit (f32f002):

CodeRabbit finding — unguarded getArchonHome() in the fallback hint.
If getArchonHome() ever throws (misconfigured env vars, permission issues
on the resolution path), the registration-failure Error would never get
constructed: we'd throw a secondary home-resolution error that masks the
root cause. Wrap the fallback branch in try/catch — prefer losing the
exact path in the hint over replacing the actionable registration error.
A safe generic hint ("Check your Archon workspace registration and retry")
takes over when getArchonHome() throws. The original error.message is
always embedded verbatim in the re-thrown Error.

S2 — export extractStaleWorkspaceEntry for direct table tests. The parser
is where the cross-package string contract with @archon/paths actually
lives; direct tests against it are cheaper than end-to-end CLI tests and
pin the edge cases:

- POSIX path with forward slashes (typical unix user)
- Windows path with backslashes (verifies Math.max(lastIndexOf / , lastIndexOf \))
- Unrelated error message (no prefix) → null
- Prefix matches but delimiter missing → null
- Source path without any separator → null (guards against returning
  empty string, which would produce a nonsense "Remove the stale
  workspace entry at " hint)
- Empty string → null

Six new cases in the test file. The claim of Windows support in the
PR description is now actually verified.

* fix(test): make generic-hint assertion path-separator agnostic

Windows test runner (CI) hit:
  Expected to contain: "Check your Archon workspace registration under /home/test/.archon/workspaces"
  Received: "... under \home\test\.archon\workspaces and retry, ..."

path.join normalizes to `\` on Windows and `/` on POSIX. The test hardcoded
forward slashes in the expected substring. Split into two separator-agnostic
asserts: the prefix up to "under", then `/workspaces\b/` regex for the final
path segment. Behavior doesn't change — the hint still gets the full
path.join'd workspaces dir on either platform.

---------

Co-authored-by: Bortlesboat <Bortlesboat@users.noreply.github.com>
(cherry picked from commit 056707d)

* fix(server,web,workflows): web approval gates auto-resume + reject-with-reason dialog (coleam00#1329)

* fix(server,web,workflows): web approval gates auto-resume + reject-with-reason dialog

Fixes three tightly-coupled bugs that made web approval gates unusable:

1. orchestrator-agent did not pass parentConversationId to executeWorkflow
   for any web-dispatched foreground / interactive / resumable run. Without
   that field, findResumableRunByParentConversation (the machinery the CLI
   relies on for resume) couldn't find the paused run from the same
   conversation on a follow-up message, and the approve/reject API handlers
   had no conversation to dispatch back to.

2. POST /api/workflows/runs/:runId/{approve,reject} recorded the decision
   and returned "Send a message to continue the workflow." — the workflow
   never actually resumed. Added tryAutoResumeAfterGate() that mirrors what
   workflowApproveCommand / workflowRejectCommand already do on the CLI:
   look up the parent conversation, dispatch `/workflow run <name>
   <userMessage>` back through dispatchToOrchestrator. Failures are
   non-fatal — the user can still send a manual message as a fallback.

3. The during-streaming cancel-check in dag-executor aborted any streaming
   node whenever the run status left 'running', including the legitimate
   transition to 'paused' that an approval node performs. A concurrent AI
   node in the same DAG layer now tolerates 'paused' and finishes its own
   stream; only truly terminal / unknown states (null, cancelled, failed,
   completed) abort the in-flight stream.

Web UI: ConfirmRunActionDialog gains an optional reasonInput prop (label +
placeholder) that renders a textarea and passes the trimmed value to
onConfirm. WorkflowRunCard (dashboard) and WorkflowProgressCard (chat)
both use it for Reject now — the chat card was still on window.confirm,
which was both inconsistent with the dashboard and couldn't collect a
reason. The trimmed reason threads through to $REJECTION_REASON in the
workflow's on_reject prompt.

Supersedes coleam00#1147. @jonasvanderhaegen surfaced the root cause and shape of
the fix; that PR was 87 commits stale and pre-dated the reject-UX upgrade
(coleam00#1261 area), so this is a fresh re-do on current dev.

Tests:
- packages/server/src/routes/api.workflow-runs.test.ts — 5 new cases:
  approve with parent dispatches; approve without parent returns "Send a
  message"; approve with deleted parent conversation skips safely; reject
  dispatches on-reject flows; reject that cancels (no on_reject) does NOT
  dispatch.
- packages/core/src/orchestrator/orchestrator.test.ts — updated the two
  synthesizedPrompt-dispatch tests for the new executeWorkflow arity.

Closes coleam00#1131.

Co-authored-by: Jonas Vanderhaegen <7755555+jonasvanderhaegen@users.noreply.github.com>

* fix: address multi-agent review findings for web approval auto-resume

C1 (critical) — cross-adapter misrouting guard
  tryAutoResumeAfterGate now checks parentConv.platform_type === 'web'
  before dispatching. Non-web parents (Slack/Telegram/GitHub/Discord)
  being approved from the dashboard skip auto-resume rather than
  dispatching a Slack thread_ts or Telegram chat_id through the web
  adapter's lock manager.

C2 (critical) — fire-and-forget dispatch replaced with await
  void dispatchToOrchestrator() meant the "Resuming workflow." response
  fired before async work completed, and the outer try/catch couldn't
  observe dispatch failures. Changed to await; response now accurately
  reflects dispatch outcome.

I1 — replaced logPrefix string-template (which produced 3-segment
  api.workflow_*.dispatched event names violating {domain}.{action}_{state})
  with literal event names per action, branched inside the helper.
  Accepts action: 'approve' | 'reject' instead.

I2 — corrected misleading "foreground/interactive" qualifier in the
  approve-endpoint comment; background web dispatches also set
  parent_conversation_id via the pre-created run, so they auto-resume too.

I3 — extracted shouldContinueStreamingForStatus() as a small exported
  policy and added 7 unit tests covering running/paused/null/cancelled/
  failed/completed/unknown. Full-integration coverage of the paused-
  tolerance invariant would require manipulating the 10s
  CANCEL_CHECK_INTERVAL_MS, which is flaky-prone; unit test of the
  policy function captures the same invariant deterministically.

I4 — updated approval-nodes.md and authoring-workflows.md to reflect
  that Web UI approve/reject now auto-resumes (no "send a follow-up
  message" copy), documented the reject-with-reason dialog and
  $REJECTION_REASON flow, and called out the cross-platform caveat.

S1 — rewrote streaming status check as positive shouldContinue safe-list
  via the extracted policy function, matching the inline comment.

S2 — inlined handleReject on the dashboard rather than squeezing
  rejectWorkflowRun through runAction with a closure; keeps runAction
  narrow for the single-arg lifecycle actions.

S5 — new regression test covering the non-web-parent skip path
  (slack-platform parent → dispatch skipped → response falls back to
  "Send a message to continue").

S6 — removed stale reference to runAction in ConfirmRunActionDialog's
  onConfirm JSDoc (no longer accurate now that WorkflowProgressCard
  calls the dialog without runAction).

S7 — fixed misleading "user can resume manually by sending any message"
  docstring (resume is triggered by re-running the workflow command,
  not by an arbitrary message).

Skipped as out-of-scope:
  S3 — cancelWorkflowRun rowCount check (pre-existing defect; separate PR)
  S4 — tightening expect.anything() to UUID regex (deferred)
  S8 — 12-positional-arg executeWorkflow → options-bag refactor
    (tracked follow-up)

bun run validate green locally; 68 tests in api.workflow-runs.test.ts
(up from 67), 173 in dag-executor.test.ts (up from 166).

* review: close I1/I2/I3/I4/I6 — paused tolerance in loop + emitter, resume test, useId

I1 (loop inter-iteration check) — dag-executor.ts:1715
  Used `!== 'running'` in the loop node's between-iteration status check.
  A sibling approval node pausing the run in the same topological layer
  would abort the loop mid-iteration with "Loop node '<id>' stopped at
  iteration N (paused)". Switched to the shared shouldContinueStreamingForStatus
  helper so paused is tolerated — same semantics the streaming check got.
  Extended inline comment explains the sibling-layer concurrency reason.

I2 (skipIfStatusChanged emitter unregister) — dag-executor.ts:2886
  At DAG-finalization writes the helper correctly skipped writing on any
  non-running state (paused included — don't mark a paused run complete),
  but it *also* called getWorkflowEventEmitter().unregisterRun() which
  broke SSE observability for a run that's still live (waiting for user
  approval). Split the two responsibilities: skip the write for all
  non-running states, but only unregister the emitter for terminal states
  (cancelled / deleted / completed / failed). `paused` keeps the emitter
  registered so resume stays visible on the dashboard.

I3 (foreground_resume_detected branch untested) — orchestrator-agent.test.ts
  That branch was modified as part of the original fix (added
  parentConversationId as 11th positional arg) but no existing test
  configured mockFindResumableRunByParentConversation to return non-null.
  A positional mistake (e.g. accidentally swapping issueContext and
  parentConversationId) would silently break auto-resume with no failing
  test. New regression test configures the mock, asserts both the cwd
  comes from the resumable run's working_path AND parentConversationId
  is passed correctly at position 10.

I4 (null-parent log level) — api.ts tryAutoResumeAfterGate
  `getConversationById` returning null is a data-integrity signal (the
  parent conversation was deleted while the run was paused) — worth
  surfacing at info level so operators notice, not hiding at debug.
  Missing platform_conversation_id on an existing row would be an unusual
  DB state and stays at debug. Added `parentDeleted: boolean` to the log
  context so the two cases are distinguishable in observability.

I6 (hardcoded DOM id) — ConfirmRunActionDialog.tsx
  `id="confirm-run-action-reason"` collided when multiple dialog instances
  share the same page (Radix portals mitigate in practice but the code
  was fragile). Switched to React.useId() so each instance gets a unique
  id — htmlFor/id wiring preserved.

S11 (arity-only assertion) — orchestrator-agent.test.ts:1092 area
  The interactive-workflow-on-web test asserted mockExecuteWorkflow was
  called, but nothing about the args. Added a specific assertion that
  position 10 (parentConversationId) equals 'conv-1' (the caller
  conversation id) — pins the wiring that I1/I2 depend on being correct.

Deferred (from review S1-S10, I5, I7):
  - S1 (ExecuteWorkflowOptions bag) — tracked as standalone follow-up;
    12 positional args with 2 adjacent optionals is a real maintenance
    hazard but the refactor deserves its own PR.
  - S7 (WHY comment on non-web else branch) — review text says the branch
    "correctly omits" parentConversationId but the code passes it; the
    combination with the web-parent guard in tryAutoResumeAfterGate is
    intentional. Not adding a justify-what-we-don't-do comment.
  - S2/S3/S4/S5/S8/S9/S10 — pure polish (event-map ternary, platformConvId
    inlining, shared constant for REJECTION_REASON_INPUT, onChange arrow
    shorthand, discriminated union, docblock trim, suffix comment drop)
  - I5 (soften "Resuming workflow." to "— check the dashboard for progress")
    — users clicking from the dashboard are already on the dashboard; the
    current text is accurate (enqueue completed) and concise.
  - I7 (test dispatch-throws path) — covered implicitly by the try/catch
    branch of tryAutoResumeAfterGate returning false; a direct test would
    require mocking handleMessage to throw and would couple to
    dispatchToOrchestrator internals.

bun run validate green; 189 dag-executor tests, 98 orchestrator-agent
tests, 68 api.workflow-runs tests — all the new cases pass.

---------

Co-authored-by: Jonas Vanderhaegen <7755555+jonasvanderhaegen@users.noreply.github.com>
(cherry picked from commit d5c1cd9)

* feat(providers): autodetect canonical binary install paths for Claude and Codex (coleam00#1361)

Both binary resolvers previously stopped at env-var + explicit config and
threw a "not found" error when neither was set. Users who followed the
upstream-recommended install flow (Anthropic's `curl install.sh` for
Claude, `npm install -g @openai/codex`) still had to manually set either
`CLAUDE_BIN_PATH` / `CODEX_BIN_PATH` or the corresponding config field
before any workflow could run.

Add a tier-N autodetect step between the explicit config tier and the
install-instructions throw. Purely additive: env and config still win
when set (precedence covered by new tests). On autodetect miss, the same
install-instructions error fires as before.

Claude probe list (verified against docs.claude.com "Uninstall Claude
Code → Native installation" section):
  - $HOME/.local/bin/claude            (mac/linux native installer)
  - $USERPROFILE\.local\bin\claude.exe (Windows native installer)

Codex probe list (verified against openai/codex README; npm global-
install puts the binary at `{npm_prefix}/bin/<name>` on POSIX,
`{npm_prefix}\<name>.cmd` on Windows):
  - $HOME/.npm-global/bin/codex   (user-set `npm config set prefix`)
  - /opt/homebrew/bin/codex       (mac arm64 with homebrew-node)
  - /usr/local/bin/codex          (mac intel / linux system node)
  - %APPDATA%\npm\codex.cmd       (Windows npm global default)
  - $HOME\.npm-global\codex.cmd   (Windows user-set prefix)

Not probed (explicit override still required):
  - Custom npm prefixes — `npm root -g` would need a subprocess per
    resolve, too much surface for a probe helper
  - `brew install --cask codex` — cask layout isn't a PATH binary
  - Manual GitHub Releases extracts — placement is user-determined
  - `~/.bun/bin/codex` — not documented in openai/codex README

Pi provider intentionally has no equivalent change: the Pi SDK is
bundled into the archon binary (no subprocess), so there's no "binary"
to resolve. Pi auth lives at `~/.pi/agent/auth.json` which the SDK
already finds by default, and the PR A shim (`PI_PACKAGE_DIR`) handles
the package-dir case via Pi's own documented escape hatch.

E2E verified: removed both config entries from ~/.archon/config.yaml,
rebuilt compiled binary, ran `archon workflow run archon-assist` and a
Codex workflow. Logs showed `source: 'autodetect'` for both, responses
returned cleanly.

(cherry picked from commit b99cee4)

* fix(providers/test): use os.homedir() instead of $HOME in claude binary autodetect test

The native-installer autodetect test computed its expected path from
process.env.HOME, but the implementation uses node:os homedir(). On
Windows, HOME is typically unset (Windows uses USERPROFILE), so the
test fell back to '/Users/test' while the resolver returned the real
home dir — making the spy's path-equality check fail and breaking CI
on windows-latest.

Mirror the implementation by importing homedir() from node:os and
joining with node:path so the expected path matches the actual
platform-resolved home and separator.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
(cherry picked from commit f9f8775)

* fix(server): contain Discord login failure so it doesn't kill the server (coleam00#1365)

Reported in coleam00#1365: a user running `archon serve` with DISCORD_BOT_TOKEN
set but the "Message Content Intent" toggle disabled in the Discord
Developer Portal saw the entire server crash with `Used disallowed
intents`. Discord rejects the gateway connection (close code 4014) when
a privileged intent is requested without being enabled, and the
unguarded `await discord.start()` propagated the error all the way up,
taking the web UI down with it.

Wrap discord.start() in try/catch — log the failure with an actionable
hint (special-cased for the disallowed-intent error) and continue
running. Other adapters and the web UI come up regardless. The shutdown
handler already uses optional chaining (`discord?.stop()`) so nulling
discord after a failed start is safe.

Other adapters (Telegram, Slack, GitHub, Gitea, GitLab) have the same
unguarded-start pattern but are out of scope for this fix — addressing
them is tracked separately.

Also expanded the Discord setup docs with a caution callout that names
the exact error string and the new log event so users can grep for
both.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
(cherry picked from commit 5957c6e)

---------

Co-authored-by: Cole Medin <cole@dynamous.ai>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: Kagura <kagura.chen28@gmail.com>
Co-authored-by: Rasmus Widing <152263317+Wirasm@users.noreply.github.com>
Co-authored-by: Shay Elmualem <12733941+norbinsh@users.noreply.github.com>
Co-authored-by: Lior Franko <lior.franko@ironsrc.com>
Co-authored-by: Lior Franko <liorfr@dreamgroup.com>
Co-authored-by: Alex Siri <alexsiri7@gmail.com>
Co-authored-by: Ahmed <44034059+medevs@users.noreply.github.com>
Co-authored-by: CauchYoung <2024302072042@whu.edu.cn>
Co-authored-by: laplace young <yangqk12@whu.edu.cn>
Co-authored-by: Rasmus Widing <rasmus.widing@gmail.com>
Co-authored-by: Stefans71 <stefans71@users.noreply.github.com>
Co-authored-by: Bortlesboat <Bortlesboat@users.noreply.github.com>
Co-authored-by: Jonas Vanderhaegen <7755555+jonasvanderhaegen@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants