charles/claude-hooks

Fork

You've already forked claude-hooks

Code Issues 10 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Split main.ts into worker.ts (queue) + agent-runner.ts (execution) #36

New issue

Closed

opened 2026-04-18 10:33:59 +00:00 by claude-desktop · 0 comments

claude-desktop commented

2026-04-18 10:33:59 +00:00

Collaborator

Copy link

User story

As a maintainer, I want src/main.ts (1212 lines) split so that the per-agent task queue and the Claude Agent SDK execution live in separate modules, so that Worker.runAgent (222 lines of container setup + session resume + SDK spawn) stops being the biggest unreadable block in the codebase and each concern can be tested in isolation.

Context

src/main.ts currently owns:

HTTP server and API routes
Worker class (queue, enqueue, getResult, processNext)
Worker.runAgent — 222 lines combining: pre-flight container checks, credential+token wiring, SDK spawn, session resume, session capture
Result store with TTL
SSE broadcast for dashboard events
Storage / history / queue introspection endpoints
Prompt building

The Worker lifecycle (FIFO queue, idempotent dispatch, backpressure) is orthogonal to what happens inside a single task (container setup, SDK invocation, session bookkeeping). Splitting the two lets future changes to either side land without touching the other.

Acceptance criteria

New file layout

src/worker.ts — Worker class only (FIFO queue, enqueue, getResult, processNext, result store TTL). Knows nothing about the SDK; takes a runTask callback injected at construction.
src/agent-runner.ts — the logic currently in Worker.runAgent: container pre-flight, env construction, SDK spawn, session resume, session capture, retry-on-invalid-session. One exported function: runAgentTask(agent, task, session, env) → result.
src/main.ts — HTTP server + API routes + orchestration. Wires each Worker with runAgentTask from agent-runner.ts. Target ≤ 500 lines.

Session resume stays correct

Session-resume behavior is preserved to the character. The order of operations — check stored session → pass resume to SDK → on failure, drop session, retry fresh — is identical.
A unit test covers: (a) fresh dispatch with no stored session, (b) successful resume, (c) resume fails → session dropped and fresh retry runs.

Container mode unchanged

agent-runner.ts owns the cwd = hostCwd | workdir decision (the fix from commit 0e3ea72). Regression test: run a task in container mode and verify the SDK is spawned with a host-existing cwd.
Pre-flight check (ensureContainerReady) still fails fast with a clear error if the agent's container is down.

Behavior-preserving

All existing main.test.ts tests pass after the split. Tests can move into worker.test.ts and agent-runner.test.ts as appropriate.
Live E2E on charles/dummy-app issue → PR → merge still completes.
just qa green.

Public API stable

main.ts still exports getWorker (used by webhook.ts) with the same signature.
TaskRequest type stays exported from wherever callers currently import it (can stay in main.ts re-exported from the new module, or move to a shared types.ts — justify whichever choice in the PR).

Out of scope

webhook.ts split (see #A).
Hardening items (see #B).
Deeper test coverage for runAgent beyond the three session-resume cases listed above (see #D).

References

Codebase audit 2026-04-18.
Session-resume correctness: src/sessions.ts and its existing tests.

Dependencies

Not blocked by: anything (independent of #A / #B / #D).
Branch off: main

## User story As a **maintainer**, I want `src/main.ts` (1212 lines) split so that the per-agent task queue and the Claude Agent SDK execution live in separate modules, so that `Worker.runAgent` (222 lines of container setup + session resume + SDK spawn) stops being the biggest unreadable block in the codebase and each concern can be tested in isolation. ## Context `src/main.ts` currently owns: - HTTP server and API routes - `Worker` class (queue, enqueue, getResult, processNext) - `Worker.runAgent` — 222 lines combining: pre-flight container checks, credential+token wiring, SDK spawn, session resume, session capture - Result store with TTL - SSE broadcast for dashboard events - Storage / history / queue introspection endpoints - Prompt building The `Worker` lifecycle (FIFO queue, idempotent dispatch, backpressure) is orthogonal to what happens inside a single task (container setup, SDK invocation, session bookkeeping). Splitting the two lets future changes to either side land without touching the other. ## Acceptance criteria ### New file layout - [ ] `src/worker.ts` — `Worker` class only (FIFO queue, `enqueue`, `getResult`, `processNext`, result store TTL). Knows nothing about the SDK; takes a `runTask` callback injected at construction. - [ ] `src/agent-runner.ts` — the logic currently in `Worker.runAgent`: container pre-flight, env construction, SDK spawn, session resume, session capture, retry-on-invalid-session. One exported function: `runAgentTask(agent, task, session, env)` → result. - [ ] `src/main.ts` — HTTP server + API routes + orchestration. Wires each `Worker` with `runAgentTask` from `agent-runner.ts`. Target ≤ 500 lines. ### Session resume stays correct - [ ] Session-resume behavior is preserved to the character. The order of operations — check stored session → pass `resume` to SDK → on failure, drop session, retry fresh — is identical. - [ ] A unit test covers: (a) fresh dispatch with no stored session, (b) successful resume, (c) resume fails → session dropped and fresh retry runs. ### Container mode unchanged - [ ] `agent-runner.ts` owns the `cwd = hostCwd | workdir` decision (the fix from commit `0e3ea72`). Regression test: run a task in container mode and verify the SDK is spawned with a host-existing `cwd`. - [ ] Pre-flight check (`ensureContainerReady`) still fails fast with a clear error if the agent's container is down. ### Behavior-preserving - [ ] All existing `main.test.ts` tests pass after the split. Tests can move into `worker.test.ts` and `agent-runner.test.ts` as appropriate. - [ ] Live E2E on `charles/dummy-app` issue → PR → merge still completes. - [ ] `just qa` green. ### Public API stable - [ ] `main.ts` still exports `getWorker` (used by `webhook.ts`) with the same signature. - [ ] `TaskRequest` type stays exported from wherever callers currently import it (can stay in `main.ts` re-exported from the new module, or move to a shared `types.ts` — justify whichever choice in the PR). ## Out of scope - webhook.ts split (see **#A**). - Hardening items (see **#B**). - Deeper test coverage for `runAgent` beyond the three session-resume cases listed above (see **#D**). ## References - Codebase audit 2026-04-18. - Session-resume correctness: `src/sessions.ts` and its existing tests. ## Dependencies - **Not blocked by:** anything (independent of #A / #B / #D). - **Branch off:** `main`

claude-desktop added the

area:sessions

type:user-story

labels

2026-04-18 10:34:49 +00:00

code-lead was assigned by claude-desktop

2026-04-18 10:36:36 +00:00

code-lead referenced this issue from a commit

2026-04-18 11:03:21 +00:00

refactor(main): split main.ts into worker + agent-runner + storage

code-lead referenced this issue from a pull request that will close it,

2026-04-18 11:03:43 +00:00

refactor(main): split main.ts into worker + agent-runner + storage #39

code-lead closed this issue

2026-04-18 11:13:12 +00:00

code-lead referenced this issue from a commit

2026-04-18 11:13:13 +00:00

refactor(main): split main.ts into worker + agent-runner + storage

claude-desktop referenced this issue

2026-05-11 14:34:49 +00:00

feat(settings): inline settings tree in sidenav + flyout on collapsed rail; drop settings submenu column #1104

dev referenced this issue from a commit

2026-05-11 16:57:19 +00:00

fix(settings): address reviewer feedback on #1104

charles referenced this issue from a commit

2026-05-11 18:08:51 +00:00

fix(settings): address reviewer feedback on #1104

claude-desktop referenced this issue

2026-05-11 18:18:56 +00:00

feat(settings): inline settings tree in sidenav + flyout on collapsed rail #1109

No Branch/Tag specified

main

chore/sync-pre-push-from-forge-base

fix/flows-yaml-dispatch-identity

feat/board-tap-to-assign

dev/1107

code-lead/1106

code-lead/1108

dev/1104

code-lead/1103

code-lead/1080

dev/1087

feat/flows-yaml-ci-events

chore/board-drop-stalled-and-density-controls

fix/flows-yaml-routes-always-register

flows-yaml/api-defaults

dev/1023

fix/event-log-history-bleed

fix/janitor-fix-ci-logs-and-cap

dev/1022

fix/board-card-provider

code-lead/1036

dev/1025

code-lead/1020

dev/1017

code-lead/1026

feat/web-shortcut-registry-1018

dev/1015

code-lead/1009

code-lead/1008

dev/975

dev/969

dev/973

dev/967

code-lead/968

code-lead/953

dev/970

dev/976

code-lead/966

code-lead/956

code-lead/951

dev/962

dev/963

dev/977

dev/955

dev/983

dev/961

dev/974

code-lead/950

code-lead/939

dev/941

dev/940

dev/937

dev/938

dev/936

dev/935

feat/web-i18n-fr-locale

feat/spec-editor-ui-polish

chore/drop-legacy-compat

fix/skills-drop-preview-pane

fix/882-skills-safety-rail

dev/911

dev/909

dev/923

dev/917

dev/915

feat/879-sr11-m2-drop-legacy-skill

code-lead/873

dev/881

code-lead/869

dev/867

code-lead/845

code-lead/843

code-lead/844

dev/837

dev/861

dev/849

code-lead/837

code-lead/842

fix/dedup-rebase-inflight

dev/838

code-lead/847

dev/833

code-lead/848

pr/838

code-lead/841

feat/settings-save-bar/836

code-lead/840

dev/846

code-lead/839

dev/832

fix/board-sse-stale-cache

dev/834

dev/835

feat/settings-breadcrumbs

feat/forge-oauth-credentials

refactor/service-config-consolidation

feat/agent-tokens-to-secrets

feat/gitlab-oauth-to-db

feat/authelia-rip-and-voice-fixes

fix/rebase-storm-and-dead-letter

code-lead/797

code-lead/796

dev/811

code-lead/798

dev/810

code-lead/795

dev/808

code-lead/794

dev/805

dev/802

dev/803

feat/avatar-menu-settings-entry

feat/per-agent-token-tracking

dev/793

dev/747

dev/752

code-lead/790

code-lead/759

dev/756

dev/760

dev/741

dev/767

dev/740

dev/709

dev/644

dev/637

boss/614

dev/600

dev/611

dev/585

fix/login-bonus-fixes

boss/544

dev/542

refactor/api-prefix-and-session-gate

dev/489

boss/531

boss/518

dev/499

boss/516

dev/530

dev/517

dev/519

dev/515

dev/522

dev/503

dev/471

boss/329

dev/417

dev/418

dev/402

boss/327

dev/334

dev/332

boss/326

boss/325

dev/331

boss/324

boss/323

boss/322

dev/294

test/s11-task-analytics

dev/262

boss/270

dev/268

foreman/ui-consolidation-spec

dev/234

boss/196

boss/176

boss/164

fix/124-session-persist-bind

boss/52

dev/87

boss/73

dev/77

dev/81

dev/82

boss/79

dev/42

dev/35

boss/7

No results found.

Labels

Clear labels

area:agents

Agent types, pool scheduling, per-instance config

area:dashboard

Dashboard UI and observability surfaces

area:database

DB layer — schema, migrations, ORM, raw SQL

area:design

UI/UX mockup work — routes to designer agent

area:design-review

Design review dispatch — routes to design-reviewer agent

area:flows

Flow runner — YAML loader, executor, op registry, expression eval

area:infra

Deployment, isolation, containers, systemd units

area:meta

Tracking, scaffolding, project setup

area:security

Security — routes to reviewer-security (opus)

area:sessions

Session-id store, Claude SDK resume logic

area:webhook

Forgejo webhook routing and handlers

area:workdir

Clone cache, worktrees, git identity

security

Security-sensitive issue

Tracking or decisions, not implementation work

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

code-lead

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

charles/claude-hooks#36

Reference in a new issue

Repository

charles/claude-hooks

Title

Body

No description provided.

Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?

Rows
Columns