mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-10 12:37:55 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - The server has about 1,100 test and helper files in `server/src/__tests__` > - `server/tsconfig.json` excludes that directory, Vitest does not check types, and no script runs the tsconfig in that directory > - So a test can call a function with the wrong arguments and still pass, and no tool reports it > - This gap hid 2,168 real type errors, and some of them hid tests that did not test what they claim > - This pull request fixes all of these errors and adds the directory to the server layers from paperclipai/paperclip#18737 > - The benefit is that a type error in a server test now fails the typecheck, with no baseline and no backlog ## Linked Issues or Issue Description Refs paperclipai/paperclip#18737, which is merged and added the server layers. Refs paperclipai/paperclip#18738, which is merged and checks the test projects outside `pnpm -r`, so it is not a duplicate. Refs paperclipai/paperclip#18137, which records that this directory has no check. **What happened?** No tool checked the types of 1,074 of the 1,101 files in `server/src/__tests__`. I searched `package.json`, the workflows, and all tsconfig files. 27 files are in the program of another tsconfig, and these 27 have 0 errors. 11 of the 27 are in `helpers/maintenance/tsconfig.json`. No script ran that project when I measured this. paperclipai/paperclip#18738 now runs it. **Expected behavior** The server typecheck checks these files, and a type error fails the check. **Steps to reproduce** 1. On the base commit, run `tsc -p server/src/__tests__/tsconfig.json --noEmit`. It reports 6,536 errors and needs 12.3 GiB. 2. Add a type error to any file in `server/src/__tests__`. 3. Run `pnpm --filter @paperclipai/server typecheck`. It passes. **Paperclip version or commit** I measured the error breakdown below on commit `8dfd632452`, with TypeScript 7.0.2. The branch now includes master up to paperclipai/paperclip#18865. **Deployment mode** Not applicable. This issue applies to development and CI. No production source file in the server changes. ### Error breakdown Each row adds one change to the row above. | Step | Total errors | Change | Cause | | --- | --- | --- | --- | | Config as committed | 6,536 | | | | Add `src/types/*.d.ts` | 4,447 | -2,089 | Config. The Express request types were missing. | | Set `rootDir` to the repository root | 2,436 | -2,011 | Config. | | Set `allowImportingTsExtensions` | 2,181 | -255 | Config. Vitest accepts `.ts` imports. | | Add `ES2024.Promise` to `lib` | 2,138 | -43 | Config. Node 24 has `Promise.withResolvers`. | | Set `allowJs` for `.mjs` imports | 2,148 | +10 | Config. It removes 8 `TS7016` errors and shows new real errors. | | Set `declaration` to false | 2,142 | -6 | Config. Tests emit nothing. | | Count only files in `server/src` | 2,058 | -84 | Other packages: 53 Daytona, 29 Runner test, 2 UI. | So 4,478 of the 6,536 errors (69%) came from config or scope, and 2,058 are real type errors in 314 files. The 29 Runner test errors are also real, which gives 2,087 errors. Tests that master added after this measurement had 81 more errors, so this pull request fixes 2,168 errors. This table classifies the first 2,058 errors. | Kind of real error | Errors | | --- | --- | | Wrong argument or assignment type | 1,023 | | Stale or partial fixture objects | 525 | | Property that the type does not have | 317 | | Missing narrowing of null or unknown | 101 | | Implicit any | 60 | | Missing name or module | 16 | | Other | 16 | ### What the type errors hid Most errors were stale fixtures and loose mocks. These errors hid real test problems, and this pull request fixes them: - **A test that never ran.** `instrumentation.test.ts` required `sdk-trace-base`, which is not installed. So 3 span tests were skipped. They now run and pass. - **Assertions that could not fail.** - `issue-thread-interactions-service` used a company ID as an issue ID. - `status-card-evaluation-work` compared `[]` with `[]` in a rollback check. - `slack-conversation-lifecycle` read `item.issueId`, which does not exist. - `email-channels` used a permission key that does not exist. - `heartbeat-project-env` imported `LOW_TRUST_REVIEW_PRESET`, which is not exported. The value was undefined. - **Postgres processes that did not stop.** 11 test files called `stop` on the test database helper. That method does not exist, and the helper method is `cleanup`. - **Arguments that the service ignored.** - `methodKey` is now `connectionMethodKey` in the Daytona, Unikraft, 1Password, and Railway tests. - 108 calls passed `"owner-user"` to a parameter that expects an options object. - 9 chat wizard fixtures passed `managementContext` as `source`, so they ran `existing_app` and not `manifest`. - 2 tests passed a `{ userId }` actor that the function ignores. - Inserts into `environments` passed a `companyId` column that the table does not have. - **Problems in tests that master added during this work.** - `sandbox-creation-operations` read `database.connectionString` when an external test database was set. In that mode `database` is undefined, so the fixture would stop with a TypeError. It now uses the external URL. - `idle-completed-history` set a Dot operation to `dispatched`. That is a Muse status, and the Dot type does not have it. The fixture now uses `admitted`, which is a real in-flight Dot status. ### Possible product problems, not changed These may be real problems in production code or types. I did not change them, because this pull request does not change production behavior: - `decisions-service` `service.create` does not validate the lenient `cancel_issue_tree` input. - `createConnection` ignores `input.connectionPurpose`. - The `createConnection` route schema default stores `{}` for `transportConfig`. - `prepareManagedAiRuntime` accepted the invalid value `mode: "connection"`. - `createBinding` accepts invalid `projectionClass` strings outside class 3. - `ensureManagedProjectWorkspace` forwards an untyped `repoRef` by spread. - `routineVariableSchema.label` is optional, but `RoutineVariable.label` is required. - `ToolRunContext.projectId` may be too strict. - `withdrawInteraction` reads `issue.status`, which its type omits. - `issueService.list` and `reconcileNativeFinalizations` omit fields that they return at runtime. - `createGitHubExternalObjectProvider` handles `tokenProvider: null`, but its type forbids this value. ## What Changed - Fixed the 2,168 type errors. The diff changes 322 test and helper files. - Corrected `server/src/__tests__/tsconfig.json`. Editors and the typecheck now read the same options and report the same errors. - Added three `test-tree` layers to `server/scripts/typecheck-layers.mjs`. They read the server layers as declarations, and any error fails them. A hash of the path selects the shard, so a new file does not move other files. - Added `server/scripts/typecheck-stubs/daytona-sdk.d.ts`. Server tests reach Daytona plugin source, and the root install does not have `@daytonaio/sdk`. - Changed two imports in `ui/src/lib/issue-execution-policy.ts` to use `.js` extensions, because server tests import this file. - Made `declarationsConfig` and `--declarations-only` skip the `test-tree` layers, because these layers emit nothing. Other projects read only the source layers. Added a test for this. - Updated `doc/DEVELOPING.md`. ## Verification Run these commands: ```sh pnpm --filter @paperclipai/server typecheck pnpm exec vitest run server/scripts/typecheck-layers.test.mjs ``` Results on macOS (arm64), Node 24, 16 cores. Each check ran after the merge of paperclipai/paperclip#18738 unless the row says otherwise: | Check | Commit | Result | | --- | --- | --- | | Server typecheck, `PAPERCLIP_TYPECHECK_LOW_MEMORY=1`, all 7 layers | `6e45a08573` | Exit 0, 0 errors, 62 seconds, peak 3.52 GiB | | `node scripts/typecheck-test-projects.mjs --low-memory` | `a3306bd13e` | Exit 0, 0 errors, 42 seconds, peak 3.25 GiB | | The same script with `--reuse-declarations` | `1b878aabc0` | Exit 0, 0 errors | | `typecheck-layers.test.mjs` and `live-recovery-work.test.ts` | `01db5634e4` | 90 passed. These include real compiler runs for a pass, a type error, and an invalid tsconfig. | | `tsconfig.declarations.json` after a full server typecheck | `0fb1e4fb0a` | It references only `below`, `cycle`, and `above`. No generated config names a `tsconfig.layers.json` file. | | Owned runtime test in `idle-completed-history` | `e8f2f448ac` | Passed, with the fix that master later replaced | | `idle-incoming-wake`, `plugin-idle-manager`, and the changed `chat-channels` test | `6e45a08573` | 30 passed | | Runner `native-execution.test.ts` | `eab4dcc1f4` | 114 passed | | The 19 server test files that changed since `eab4dcc1f4`, and `typecheck-layers.test.mjs` | `259737b700` | 4,275 of 4,277 passed. The 2 failures are in `chat-channels` and are in the list of 7 below. | The peak is the largest single process, from `/usr/bin/time -l`. Peaks for the server typecheck were between 3.42 GiB and 3.56 GiB across 8 runs. Peaks for the test projects were 3.25 GiB and 3.37 GiB across 2 runs. I did not measure a cgroup. **Runtime check of the fixes.** Types do not prove that a test still works. So I ran all 309 changed server test files, 11,929 tests, before the rebase onto paperclipai/paperclip#18737: | Result | Tests | Detail | | --- | --- | --- | | Passed | 11,913 | Includes the 2 tests and the 54 `dot-runner` tests that passed in a later run, as described below. | | Failed | 7 | The same 7 tests also fail on the commit before the fixes. | | Skipped | 9 | These tests have their own skip conditions: `sentry` 5, and 1 each in `bundled-plugin-registration`, `customer-success-cloud`, `onepassword-connection`, and `workspace-runtime-https-live-exercise`. | The 7 tests that fail with and without this change, on my machine: - 3 tests in `chat-channels` and `email-channels` stop with `ENOENT` on a `SKILL.md` file. The path is in the parent checkout, above the git worktree that I used, so I expect that the worktree is the cause. I did not prove this. - `workspace-instance-cleanup` compares `/private/var/...` with `/var/...`. This is a macOS symlink difference. - 2 tests in `git-reproducible-managed-checkouts` get `unknown_base_git_files` and expect `unpushed_managed_checkout`. I did not find the cause. - 1 more test in `chat-channels`, `materializes direct external-chat finals once`, gets `undefined`. I did not find the cause. CI is the check for these 7 tests. `ci / verify` passed on `eab4dcc1f4`. Failures during this work: - My fix to `agent-runtime-connector-access` changed an invalid permission key in the setup, but not in the assertion. The runtime check found this. I corrected the assertion, and the file passes. - `heartbeat-plugin-environment` failed one wait in the full run. It passed three times alone, so I think that load caused the failure. It can fail again under load. - `dot-runner` skipped all 54 tests in the full run because `cargo` was not on my `PATH`. It then passed 54 of 54 with the toolchain on the `PATH`. - My first `lib` value removed the default DOM types, and the error count went up by 375. I added the DOM libraries. - My Daytona stub with bare `any` left 48 errors, because generic helpers then inferred `unknown`. I added shapes that return promises. - One fix to `agent-secrets-routes` used `class_3_static_lease`, and the test failed. That class allows only specific paths. I reverted to `unclassified`. - `ci / General tests (server (8/12))` failed on `259737b700` because of the flaky port in `idle-completed-history`. paperclipai/paperclip#18853 fixed this test on master, so this pull request keeps that fix. **Audit of the diff.** I counted these patterns in added and removed lines, to find fixes that only hide an error: | Pattern | Added | Removed | | --- | --- | --- | | `@ts-ignore` | 0 | 0 | | `@ts-expect-error` | 0 | 1 | | `.skip` | 0 | 0 | | `as any` | 9 | 9 | | `: any` | 11 | 2 | | `as never` | 8 | 2 | | `as unknown as` | 35 | 4 | | `Promise<unknown>` | 16 | 5 | | `expect(` | 128 | 113 | No hunk removes more `expect(` calls than it adds. Three removals of test content were intentional, and I checked each one: - `muse-control` removed `signalToken`. Line 1012 already asserts that it is absent. - `merged-pr-confirmation-sweep` removed legacy aliases. Other tests cover them. - `heartbeat-workspace-branch-containment` removed a `finalize` branch that no test row can reach. Some partial fixtures stay unchecked through `as unknown as` and `Promise<unknown>`, mostly in `issue-agent-mutation-ownership-routes` and `issue-comment-reopen-routes`. **Accuracy of the check.** One program over the tree and the three shards reported the same errors at the same positions. Memory, as the peak of the largest process on one thread, was 3.93 GiB for one program and 2.43 GiB for the largest shard. I measured these two values before the fixes. Not run or not proven: - I did not run the full `pnpm test:run`, or a root `pnpm build`. I expect CI to run the full suites. - I did not run the 4 GiB container check, or the full `scripts/typecheck-low-memory.mjs`. The peaks above come from macOS, so they are not a Linux cgroup measurement. - I did not run the UI typecheck after the merges. - `workspace-runtime-https-live-exercise` is skipped, so its `cleanup` fix did not run. ## Risks - **A large diff in test files.** 328 files change. A pull request that edits the same tests can get merge conflicts. New tests on master can also add type errors before this merges. Any such error fails this check and needs a fix here. - **A higher cost for changes to source types.** A change to a type can add errors in test files that the author did not touch. The author must then fix them. This is the purpose of the check, but it is new work. - **Changed test behavior.** Some tests now run paths that they did not run before, such as the 9 chat wizard fixtures and the 3 span tests. They pass here, but they can be more sensitive to timing or to the environment. - **The Daytona stub can go stale.** The stub is written by hand. If the plugin uses a new SDK member, the typecheck reports an error until someone updates the stub. - **The release path.** `release-verify.yml` and `scripts/release.sh` run `pnpm -r typecheck`, so they now run this check. - **The tsconfig change.** The test transform reads `server/src/__tests__/tsconfig.json`. The options that I changed are for type checks, and the runs above passed. - **A gap that remains.** Tsconfigs in `packages/paperclip-runner` and in most sandbox provider plugins exclude `*.test.ts`. This check does not read most of those test files, so they can still drift. That work is separate from this pull request. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used Anthropic Claude Opus 5.5 (`claude-opus-5-5`) through Claude Code, with reasoning, tool use, code execution, and subagents. The runtime does not show the context window size. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [ ] I have run tests locally and they pass (7 tests fail locally, with and without this change. See Verification.) - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
1170 lines
38 KiB
TypeScript
1170 lines
38 KiB
TypeScript
import { execFile } from "node:child_process";
|
|
import { randomUUID } from "node:crypto";
|
|
import { mkdtemp, rm, writeFile } from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { promisify } from "node:util";
|
|
import { eq, ne } from "drizzle-orm";
|
|
import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest";
|
|
import {
|
|
costEvents,
|
|
activityLog,
|
|
agentRuntimeState,
|
|
agentTaskSessions,
|
|
agentWakeupRequests,
|
|
agents,
|
|
authUsers,
|
|
companies,
|
|
companyMemberships,
|
|
companySkills,
|
|
createDb,
|
|
documentRevisions,
|
|
documents,
|
|
executionWorkspaces,
|
|
heartbeatRunEvents,
|
|
heartbeatRuns,
|
|
issueComments,
|
|
issueDocuments,
|
|
issuePlanDecompositions,
|
|
issueThreadInteractions,
|
|
issues,
|
|
projects,
|
|
projectWorkspaces,
|
|
workspaceOperations,
|
|
} from "@paperclipai/db";
|
|
import {
|
|
getEmbeddedPostgresTestSupport,
|
|
startEmbeddedPostgresTestDatabase,
|
|
} from "./helpers/embedded-postgres.js";
|
|
import { drainHeartbeatRunsToQuiescence } from "./helpers/drain-heartbeat-runs.js";
|
|
import { heartbeatService } from "../services/heartbeat.ts";
|
|
import { instanceSettingsService } from "../services/instance-settings.ts";
|
|
import { issueService } from "../services/issues.ts";
|
|
|
|
const execFileAsync = promisify(execFile);
|
|
|
|
const adapterExecute = vi.hoisted(() => vi.fn(async (_input?: unknown) => ({
|
|
exitCode: 0,
|
|
signal: null,
|
|
timedOut: false,
|
|
sessionParams: { sessionId: "fresh-session" },
|
|
sessionDisplayId: "fresh-session",
|
|
summary: "Accepted plan workspace refresh test run.",
|
|
provider: "test",
|
|
model: "test-model",
|
|
})));
|
|
|
|
vi.mock("../adapters/index.js", () => ({
|
|
getServerAdapter: () => ({
|
|
type: "codex_local",
|
|
execute: adapterExecute,
|
|
supportsLocalAgentJwt: false,
|
|
}),
|
|
findActiveServerAdapter: () => ({
|
|
type: "codex_local",
|
|
execute: adapterExecute,
|
|
supportsLocalAgentJwt: false,
|
|
}),
|
|
runningProcesses: new Map(),
|
|
}));
|
|
|
|
const embeddedPostgresSupport = await getEmbeddedPostgresTestSupport();
|
|
const describeEmbeddedPostgres = embeddedPostgresSupport.supported ? describe : describe.skip;
|
|
|
|
if (!embeddedPostgresSupport.supported) {
|
|
console.warn(
|
|
`Skipping embedded Postgres accepted-plan workspace refresh tests on this host: ${embeddedPostgresSupport.reason ?? "unsupported environment"}`,
|
|
);
|
|
}
|
|
|
|
async function runGit(cwd: string, args: string[]) {
|
|
const result = await execFileAsync("git", args, { cwd });
|
|
return result.stdout.trim();
|
|
}
|
|
|
|
async function createGitRepo() {
|
|
const repoRoot = await mkdtemp(path.join(os.tmpdir(), "paperclip-accepted-plan-repo-"));
|
|
await runGit(repoRoot, ["init"]);
|
|
await runGit(repoRoot, ["checkout", "-B", "master"]);
|
|
await runGit(repoRoot, ["config", "user.email", "paperclip-test@example.com"]);
|
|
await runGit(repoRoot, ["config", "user.name", "Paperclip Test"]);
|
|
await writeFile(path.join(repoRoot, "README.md"), "accepted plan workspace refresh\n");
|
|
await runGit(repoRoot, ["add", "README.md"]);
|
|
await runGit(repoRoot, ["commit", "-m", "initial"]);
|
|
return repoRoot;
|
|
}
|
|
|
|
async function createGitRepoWithOrigin() {
|
|
const repoRoot = await createGitRepo();
|
|
const originRoot = await mkdtemp(path.join(os.tmpdir(), "paperclip-accepted-plan-origin-"));
|
|
await runGit(originRoot, ["init", "--bare"]);
|
|
await runGit(repoRoot, ["remote", "add", "origin", originRoot]);
|
|
await runGit(repoRoot, ["push", "-u", "origin", "master"]);
|
|
await runGit(repoRoot, ["fetch", "origin", "master"]);
|
|
return { repoRoot, originRoot };
|
|
}
|
|
|
|
describeEmbeddedPostgres("accepted plan workspace refresh", () => {
|
|
let db!: ReturnType<typeof createDb>;
|
|
let tempDb: Awaited<ReturnType<typeof startEmbeddedPostgresTestDatabase>> | null = null;
|
|
const tempRoots: string[] = [];
|
|
|
|
async function grantResponsibleUser(companyId: string) {
|
|
await db.insert(authUsers).values({
|
|
id: "responsible-user", name: "Responsible user", email: "accepted-plan@example.test",
|
|
createdAt: new Date(), updatedAt: new Date(),
|
|
}).onConflictDoNothing();
|
|
await db.insert(companyMemberships).values({
|
|
companyId, principalType: "user", principalId: "responsible-user",
|
|
status: "active", membershipRole: "member",
|
|
});
|
|
}
|
|
|
|
beforeAll(async () => {
|
|
tempDb = await startEmbeddedPostgresTestDatabase("paperclip-accepted-plan-workspace-");
|
|
db = createDb(tempDb.connectionString);
|
|
}, 20_000);
|
|
|
|
afterEach(async () => {
|
|
// Await every in-flight background heartbeat run to quiescence before the
|
|
// deletes below. A wakeup claims a run and dispatches its execution
|
|
// fire-and-forget, and that run can dispatch a follow-up wakeup, so a run or
|
|
// wakeup can still write heartbeat_runs and issues rows when teardown starts
|
|
// and would race the deletes. The shared drain also awaits an in-flight
|
|
// wakeup that is still before run registration, which a plain run table
|
|
// status poll cannot see.
|
|
await drainHeartbeatRunsToQuiescence(db, heartbeatService(db));
|
|
adapterExecute.mockClear();
|
|
while (tempRoots.length > 0) {
|
|
const root = tempRoots.pop();
|
|
if (root) await rm(root, { recursive: true, force: true }).catch(() => undefined);
|
|
}
|
|
await db.delete(issuePlanDecompositions);
|
|
await db.delete(issueThreadInteractions);
|
|
await db.delete(issueDocuments);
|
|
await db.delete(documentRevisions);
|
|
await db.delete(documents);
|
|
await db.delete(agentTaskSessions);
|
|
await db.delete(executionWorkspaces);
|
|
for (let attempt = 0; attempt < 5; attempt += 1) {
|
|
await db.delete(activityLog);
|
|
await db.delete(heartbeatRunEvents);
|
|
try {
|
|
await db.delete(costEvents);
|
|
await db.delete(heartbeatRuns);
|
|
break;
|
|
} catch (error) {
|
|
if (attempt === 4) throw error;
|
|
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
}
|
|
}
|
|
await db.delete(issueComments);
|
|
await db.delete(issues);
|
|
await db.delete(projectWorkspaces);
|
|
await db.delete(projects);
|
|
await db.delete(agentWakeupRequests);
|
|
await db.delete(agentRuntimeState);
|
|
await db.delete(agents);
|
|
await db.delete(workspaceOperations);
|
|
await db.delete(companySkills);
|
|
await db.delete(companyMemberships);
|
|
await db.delete(companies);
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await db.$client.end();
|
|
await tempDb?.cleanup();
|
|
});
|
|
|
|
async function seedAcceptedPlanClaim(args: {
|
|
companyId: string;
|
|
issueId: string;
|
|
ownerAgentId: string;
|
|
status?: "in_flight" | "completed";
|
|
}) {
|
|
const documentId = randomUUID();
|
|
const revisionId = randomUUID();
|
|
|
|
await db.insert(documents).values({
|
|
id: documentId,
|
|
companyId: args.companyId,
|
|
title: "Plan",
|
|
format: "markdown",
|
|
latestBody: "Plan body",
|
|
latestRevisionId: revisionId,
|
|
latestRevisionNumber: 1,
|
|
createdByAgentId: args.ownerAgentId,
|
|
updatedByAgentId: args.ownerAgentId,
|
|
});
|
|
await db.insert(documentRevisions).values({
|
|
id: revisionId,
|
|
companyId: args.companyId,
|
|
documentId,
|
|
revisionNumber: 1,
|
|
title: "Plan",
|
|
format: "markdown",
|
|
body: "Plan body",
|
|
createdByAgentId: args.ownerAgentId,
|
|
});
|
|
await db.insert(issueDocuments).values({
|
|
companyId: args.companyId,
|
|
issueId: args.issueId,
|
|
documentId,
|
|
key: "plan",
|
|
});
|
|
await db.insert(issuePlanDecompositions).values({
|
|
companyId: args.companyId,
|
|
sourceIssueId: args.issueId,
|
|
acceptedPlanRevisionId: revisionId,
|
|
status: args.status ?? "in_flight",
|
|
requestFingerprint: `claim:${args.issueId}`,
|
|
requestedChildCount: 1,
|
|
requestedChildren: [{ title: "child-1" }],
|
|
childIssueIds: [],
|
|
ownerAgentId: args.ownerAgentId,
|
|
updatedAt: new Date(),
|
|
...(args.status === "completed" ? { completedAt: new Date() } : {}),
|
|
});
|
|
}
|
|
|
|
async function seedAcceptedPlanAcceptance(args: {
|
|
companyId: string;
|
|
issueId: string;
|
|
ownerAgentId: string;
|
|
}) {
|
|
const documentId = randomUUID();
|
|
const revisionId = randomUUID();
|
|
const interactionId = randomUUID();
|
|
|
|
await db.insert(documents).values({
|
|
id: documentId,
|
|
companyId: args.companyId,
|
|
title: "Plan",
|
|
format: "markdown",
|
|
latestBody: "Plan body",
|
|
latestRevisionId: revisionId,
|
|
latestRevisionNumber: 1,
|
|
createdByAgentId: args.ownerAgentId,
|
|
updatedByAgentId: args.ownerAgentId,
|
|
});
|
|
await db.insert(documentRevisions).values({
|
|
id: revisionId,
|
|
companyId: args.companyId,
|
|
documentId,
|
|
revisionNumber: 1,
|
|
title: "Plan",
|
|
format: "markdown",
|
|
body: "Plan body",
|
|
createdByAgentId: args.ownerAgentId,
|
|
});
|
|
await db.insert(issueDocuments).values({
|
|
companyId: args.companyId,
|
|
issueId: args.issueId,
|
|
documentId,
|
|
key: "plan",
|
|
});
|
|
await db.insert(issueThreadInteractions).values({
|
|
id: interactionId,
|
|
companyId: args.companyId,
|
|
issueId: args.issueId,
|
|
kind: "request_confirmation",
|
|
status: "accepted",
|
|
continuationPolicy: "wake_assignee",
|
|
payload: {
|
|
version: 1,
|
|
prompt: "Approve this plan?",
|
|
target: {
|
|
type: "issue_document",
|
|
issueId: args.issueId,
|
|
documentId,
|
|
key: "plan",
|
|
revisionId,
|
|
revisionNumber: 1,
|
|
},
|
|
},
|
|
result: {
|
|
version: 1,
|
|
outcome: "accepted",
|
|
},
|
|
resolvedAt: new Date(),
|
|
createdByUserId: "local-board",
|
|
resolvedByUserId: "local-board",
|
|
});
|
|
|
|
return revisionId;
|
|
}
|
|
|
|
it("realizes an isolated workspace and drops stale shared task-session params before executing", async () => {
|
|
const companyId = randomUUID();
|
|
const projectId = randomUUID();
|
|
const projectWorkspaceId = randomUUID();
|
|
const sharedExecutionWorkspaceId = randomUUID();
|
|
const issueId = randomUUID();
|
|
const agentId = randomUUID();
|
|
const repoRoot = await createGitRepo();
|
|
tempRoots.push(repoRoot);
|
|
|
|
await instanceSettingsService(db).updateExperimental({
|
|
enableIsolatedWorkspaces: true,
|
|
});
|
|
await db.insert(companies).values({
|
|
id: companyId,
|
|
name: "Acme",
|
|
issuePrefix: `T${companyId.replace(/-/g, "").slice(0, 6).toUpperCase()}`,
|
|
status: "active",
|
|
defaultResponsibleUserId: "responsible-user",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await grantResponsibleUser(companyId);
|
|
await db.insert(projects).values({
|
|
id: projectId,
|
|
companyId,
|
|
name: "Accepted Plan Workspace Refresh",
|
|
status: "active",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(projectWorkspaces).values({
|
|
id: projectWorkspaceId,
|
|
companyId,
|
|
projectId,
|
|
name: "Primary",
|
|
cwd: repoRoot,
|
|
isPrimary: true,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(agents).values({
|
|
id: agentId,
|
|
companyId,
|
|
name: "CodexCoder",
|
|
role: "engineer",
|
|
status: "idle",
|
|
adapterType: "codex_local",
|
|
adapterConfig: {},
|
|
runtimeConfig: {},
|
|
permissions: {},
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(executionWorkspaces).values({
|
|
id: sharedExecutionWorkspaceId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
mode: "shared_workspace",
|
|
strategyType: "project_primary",
|
|
name: "Shared planning workspace",
|
|
status: "active",
|
|
cwd: repoRoot,
|
|
providerType: "local_fs",
|
|
providerRef: repoRoot,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(issues).values({
|
|
id: issueId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
title: "Implement accepted plan",
|
|
status: "in_progress",
|
|
workMode: "planning",
|
|
priority: "medium",
|
|
responsibleUserId: "responsible-user",
|
|
assigneeAgentId: agentId,
|
|
identifier: "PAP-9122",
|
|
executionWorkspaceId: sharedExecutionWorkspaceId,
|
|
executionWorkspaceSettings: {
|
|
mode: "isolated_workspace",
|
|
},
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(agentTaskSessions).values({
|
|
companyId,
|
|
agentId,
|
|
adapterType: "codex_local",
|
|
taskKey: issueId,
|
|
sessionParamsJson: {
|
|
sessionId: "stale-shared-session",
|
|
cwd: repoRoot,
|
|
workspaceId: projectWorkspaceId,
|
|
},
|
|
sessionDisplayId: "stale-shared-session",
|
|
});
|
|
adapterExecute.mockImplementationOnce(async () => {
|
|
await db.update(issues).set({ status: "done", updatedAt: new Date() }).where(eq(issues.id, issueId));
|
|
return {
|
|
exitCode: 0,
|
|
signal: null,
|
|
timedOut: false,
|
|
sessionParams: { sessionId: "fresh-session" },
|
|
sessionDisplayId: "fresh-session",
|
|
summary: "Accepted plan workspace refresh test run.",
|
|
provider: "test",
|
|
model: "test-model",
|
|
};
|
|
});
|
|
|
|
const heartbeat = heartbeatService(db);
|
|
const run = await heartbeat.wakeup(agentId, {
|
|
source: "automation",
|
|
triggerDetail: "system",
|
|
reason: "issue_commented",
|
|
contextSnapshot: {
|
|
issueId,
|
|
taskId: issueId,
|
|
wakeReason: "issue_commented",
|
|
interactionKind: "request_confirmation",
|
|
interactionStatus: "accepted",
|
|
forceFreshSession: true,
|
|
workspaceRefreshReason: "accepted_plan_confirmation",
|
|
},
|
|
});
|
|
|
|
expect(run).not.toBeNull();
|
|
await vi.waitFor(async () => {
|
|
const latest = await heartbeat.getRun(run!.id);
|
|
expect(latest?.status).toBe("succeeded");
|
|
}, { timeout: 10_000 });
|
|
|
|
expect(adapterExecute).toHaveBeenCalledTimes(1);
|
|
const adapterInput = adapterExecute.mock.calls[0]?.[0] as {
|
|
runtime: { sessionId: string | null; sessionParams: Record<string, unknown> | null };
|
|
context: Record<string, unknown>;
|
|
};
|
|
expect(adapterInput.runtime.sessionId).toBeNull();
|
|
expect(adapterInput.runtime.sessionParams).toBeNull();
|
|
expect(adapterInput.context.paperclipWorkspace).toEqual(expect.objectContaining({
|
|
mode: "isolated_workspace",
|
|
strategy: "git_worktree",
|
|
}));
|
|
expect((adapterInput.context.paperclipWorkspace as { cwd: string }).cwd).not.toBe(repoRoot);
|
|
|
|
const refreshedIssue = await db
|
|
.select({
|
|
executionWorkspaceId: issues.executionWorkspaceId,
|
|
executionWorkspaceSettings: issues.executionWorkspaceSettings,
|
|
})
|
|
.from(issues)
|
|
.where(eq(issues.id, issueId))
|
|
.then((rows) => rows[0]);
|
|
expect(refreshedIssue?.executionWorkspaceId).toBeTruthy();
|
|
expect(refreshedIssue?.executionWorkspaceId).not.toBe(sharedExecutionWorkspaceId);
|
|
expect(refreshedIssue?.executionWorkspaceSettings).toMatchObject({
|
|
mode: "isolated_workspace",
|
|
});
|
|
|
|
const isolatedRows = await db
|
|
.select()
|
|
.from(executionWorkspaces)
|
|
.where(ne(executionWorkspaces.id, sharedExecutionWorkspaceId));
|
|
expect(isolatedRows).toHaveLength(1);
|
|
expect(isolatedRows[0]).toMatchObject({
|
|
mode: "isolated_workspace",
|
|
strategyType: "git_worktree",
|
|
sourceIssueId: issueId,
|
|
});
|
|
expect(isolatedRows[0]?.cwd).not.toBe(repoRoot);
|
|
}, 20_000);
|
|
|
|
it("keeps accepted-plan children strategy-only until first realization after the base ref moves", async () => {
|
|
const companyId = randomUUID();
|
|
const projectId = randomUUID();
|
|
const projectWorkspaceId = randomUUID();
|
|
const sourceIssueId = randomUUID();
|
|
const agentId = randomUUID();
|
|
const { repoRoot, originRoot } = await createGitRepoWithOrigin();
|
|
tempRoots.push(repoRoot, originRoot);
|
|
|
|
await instanceSettingsService(db).updateExperimental({
|
|
enableIsolatedWorkspaces: true,
|
|
});
|
|
await db.insert(companies).values({
|
|
id: companyId,
|
|
name: "Acme",
|
|
issuePrefix: `T${companyId.replace(/-/g, "").slice(0, 6).toUpperCase()}`,
|
|
status: "active",
|
|
defaultResponsibleUserId: "responsible-user",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await grantResponsibleUser(companyId);
|
|
await db.insert(projects).values({
|
|
id: projectId,
|
|
companyId,
|
|
name: "Accepted Plan Branch Freshness",
|
|
status: "active",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(projectWorkspaces).values({
|
|
id: projectWorkspaceId,
|
|
companyId,
|
|
projectId,
|
|
name: "Primary",
|
|
cwd: repoRoot,
|
|
isPrimary: true,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(agents).values({
|
|
id: agentId,
|
|
companyId,
|
|
name: "CodexCoder",
|
|
role: "engineer",
|
|
status: "idle",
|
|
adapterType: "codex_local",
|
|
adapterConfig: {},
|
|
runtimeConfig: {
|
|
heartbeat: {
|
|
wakeOnDemand: true,
|
|
maxConcurrentRuns: 1,
|
|
},
|
|
},
|
|
permissions: {},
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(issues).values({
|
|
id: sourceIssueId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
title: "Planning source issue",
|
|
status: "in_progress",
|
|
workMode: "planning",
|
|
priority: "medium",
|
|
responsibleUserId: "responsible-user",
|
|
assigneeAgentId: agentId,
|
|
identifier: "PAP-1584",
|
|
executionWorkspaceSettings: {
|
|
mode: "isolated_workspace",
|
|
workspaceStrategy: {
|
|
type: "git_worktree",
|
|
baseRef: "origin/master",
|
|
branchTemplate: "{{issue.identifier}}-{{slug}}",
|
|
},
|
|
},
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
|
|
const heartbeat = heartbeatService(db);
|
|
adapterExecute.mockImplementationOnce(async () => {
|
|
// Planning is awaiting a real confirmation, not a prose-only promise.
|
|
await db.insert(issueThreadInteractions).values({
|
|
companyId, issueId: sourceIssueId, kind: "request_confirmation", status: "pending",
|
|
requestedResolverPolicy: "anyone", effectiveResolverPolicy: "anyone",
|
|
payload: { version: 1, prompt: "Review the source plan" },
|
|
});
|
|
return {
|
|
exitCode: 0,
|
|
signal: null,
|
|
timedOut: false,
|
|
sessionParams: { sessionId: "planning-source-session" },
|
|
sessionDisplayId: "planning-source-session",
|
|
summary: "Realized the planning source workspace.",
|
|
provider: "test",
|
|
model: "test-model",
|
|
}; });
|
|
|
|
const sourceRun = await heartbeat.wakeup(agentId, {
|
|
source: "automation",
|
|
triggerDetail: "system",
|
|
reason: "issue_commented",
|
|
contextSnapshot: {
|
|
issueId: sourceIssueId,
|
|
taskId: sourceIssueId,
|
|
wakeReason: "issue_commented",
|
|
skipIssueComment: true,
|
|
},
|
|
});
|
|
expect(sourceRun).not.toBeNull();
|
|
await vi.waitFor(async () => {
|
|
const latest = await heartbeat.getRun(sourceRun!.id);
|
|
expect(latest?.status).toBe("succeeded");
|
|
}, { timeout: 10_000 });
|
|
|
|
const sourceWorkspace = await db
|
|
.select()
|
|
.from(executionWorkspaces)
|
|
.where(eq(executionWorkspaces.sourceIssueId, sourceIssueId))
|
|
.then((rows) => rows[0] ?? null);
|
|
expect(sourceWorkspace).toMatchObject({
|
|
mode: "isolated_workspace",
|
|
strategyType: "git_worktree",
|
|
baseRef: "origin/master",
|
|
});
|
|
expect(sourceWorkspace?.branchName).toBeTruthy();
|
|
|
|
await writeFile(path.join(repoRoot, "base-moved.txt"), "base moved after planning\n");
|
|
await runGit(repoRoot, ["add", "base-moved.txt"]);
|
|
await runGit(repoRoot, ["commit", "-m", "Move base after planning"]);
|
|
const movedBaseSha = await runGit(repoRoot, ["rev-parse", "HEAD"]);
|
|
await runGit(repoRoot, ["push", "origin", "HEAD:master"]);
|
|
await runGit(repoRoot, ["fetch", "origin", "master"]);
|
|
|
|
await drainHeartbeatRunsToQuiescence(db, heartbeat);
|
|
await db.delete(issueThreadInteractions).where(eq(issueThreadInteractions.issueId, sourceIssueId));
|
|
const acceptedPlanRevisionId = await seedAcceptedPlanAcceptance({
|
|
companyId,
|
|
issueId: sourceIssueId,
|
|
ownerAgentId: agentId,
|
|
});
|
|
const decomposition = await issueService(db).decomposeAcceptedPlan(sourceIssueId, {
|
|
acceptedPlanRevisionId,
|
|
children: [
|
|
{
|
|
title: "Implement approved child after base move",
|
|
status: "todo",
|
|
workMode: "standard",
|
|
priority: "medium",
|
|
assigneeAgentId: agentId,
|
|
},
|
|
],
|
|
actorAgentId: agentId,
|
|
});
|
|
const childIssueId = decomposition.childIssueIds[0];
|
|
expect(childIssueId).toBeTruthy();
|
|
|
|
const childBeforeRun = await db
|
|
.select({
|
|
executionWorkspaceId: issues.executionWorkspaceId,
|
|
executionWorkspacePreference: issues.executionWorkspacePreference,
|
|
executionWorkspaceSettings: issues.executionWorkspaceSettings,
|
|
})
|
|
.from(issues)
|
|
.where(eq(issues.id, childIssueId!))
|
|
.then((rows) => rows[0] ?? null);
|
|
expect(childBeforeRun?.executionWorkspaceId).toBeNull();
|
|
expect(childBeforeRun?.executionWorkspacePreference).toBeNull();
|
|
expect(childBeforeRun?.executionWorkspaceSettings).toMatchObject({
|
|
mode: "isolated_workspace",
|
|
workspaceStrategy: {
|
|
type: "git_worktree",
|
|
baseRef: "origin/master",
|
|
branchTemplate: "{{issue.identifier}}-{{slug}}",
|
|
},
|
|
});
|
|
|
|
let childRunWorkspace = null as
|
|
| { cwd: string; branchName: string; executionWorkspaceId: string }
|
|
| null;
|
|
adapterExecute.mockImplementationOnce(async (input) => {
|
|
const context = (input as { context?: Record<string, unknown> }).context ?? {};
|
|
const workspace = context.paperclipWorkspace as Record<string, unknown> | undefined;
|
|
const cwd = typeof workspace?.cwd === "string" ? workspace.cwd : null;
|
|
const branchName = typeof workspace?.branchName === "string" ? workspace.branchName : null;
|
|
const executionWorkspaceId =
|
|
typeof context.executionWorkspaceId === "string" ? context.executionWorkspaceId : null;
|
|
if (!cwd || !branchName || !executionWorkspaceId) {
|
|
throw new Error("Accepted-plan child run did not receive a realized workspace");
|
|
}
|
|
childRunWorkspace = { cwd, branchName, executionWorkspaceId };
|
|
expect(branchName).not.toBe(sourceWorkspace?.branchName);
|
|
await expect(runGit(cwd, ["rev-parse", "HEAD"])).resolves.toBe(movedBaseSha);
|
|
await db.update(issues).set({ status: "done", updatedAt: new Date() }).where(eq(issues.id, childIssueId!));
|
|
return {
|
|
exitCode: 0,
|
|
signal: null,
|
|
timedOut: false,
|
|
sessionParams: { sessionId: "child-session" },
|
|
sessionDisplayId: "child-session",
|
|
summary: "Child realized from the moved base.",
|
|
provider: "test",
|
|
model: "test-model",
|
|
};
|
|
});
|
|
|
|
const childRun = await heartbeat.wakeup(agentId, {
|
|
source: "automation",
|
|
triggerDetail: "system",
|
|
reason: "issue_assigned",
|
|
contextSnapshot: {
|
|
issueId: childIssueId,
|
|
taskId: childIssueId,
|
|
wakeReason: "issue_assigned",
|
|
skipIssueComment: true,
|
|
},
|
|
});
|
|
expect(childRun).not.toBeNull();
|
|
await vi.waitFor(async () => {
|
|
const latest = await heartbeat.getRun(childRun!.id);
|
|
expect(latest?.status).toBe("succeeded");
|
|
}, { timeout: 10_000 });
|
|
|
|
expect(childRunWorkspace).not.toBeNull();
|
|
expect(childRunWorkspace?.executionWorkspaceId).not.toBe(sourceWorkspace?.id);
|
|
const childAfterRun = await db
|
|
.select({ executionWorkspaceId: issues.executionWorkspaceId })
|
|
.from(issues)
|
|
.where(eq(issues.id, childIssueId!))
|
|
.then((rows) => rows[0] ?? null);
|
|
expect(childAfterRun?.executionWorkspaceId).toBe(childRunWorkspace?.executionWorkspaceId);
|
|
}, 20_000);
|
|
|
|
it("forces a fresh session and suppresses accepted-plan continuation when another issue owns the in-flight claim", async () => {
|
|
const companyId = randomUUID();
|
|
const projectId = randomUUID();
|
|
const projectWorkspaceId = randomUUID();
|
|
const issueId = randomUUID();
|
|
const otherPlanningIssueId = randomUUID();
|
|
const agentId = randomUUID();
|
|
const repoRoot = await createGitRepo();
|
|
tempRoots.push(repoRoot);
|
|
|
|
await instanceSettingsService(db).updateExperimental({
|
|
enableIsolatedWorkspaces: false,
|
|
});
|
|
await db.insert(companies).values({
|
|
id: companyId,
|
|
name: "Acme",
|
|
issuePrefix: `T${companyId.replace(/-/g, "").slice(0, 6).toUpperCase()}`,
|
|
status: "active",
|
|
defaultResponsibleUserId: "responsible-user",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await grantResponsibleUser(companyId);
|
|
await db.insert(projects).values({
|
|
id: projectId,
|
|
companyId,
|
|
name: "Accepted Plan Routing",
|
|
status: "active",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(projectWorkspaces).values({
|
|
id: projectWorkspaceId,
|
|
companyId,
|
|
projectId,
|
|
name: "Primary",
|
|
cwd: repoRoot,
|
|
isPrimary: true,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(agents).values({
|
|
id: agentId,
|
|
companyId,
|
|
name: "CodexCoder",
|
|
role: "engineer",
|
|
status: "idle",
|
|
adapterType: "codex_local",
|
|
adapterConfig: {},
|
|
runtimeConfig: {},
|
|
permissions: {},
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(issues).values([
|
|
{
|
|
id: issueId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
title: "Later planning wake",
|
|
status: "in_progress",
|
|
workMode: "planning",
|
|
priority: "medium",
|
|
responsibleUserId: "responsible-user",
|
|
assigneeAgentId: agentId,
|
|
identifier: "PAP-9301",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
},
|
|
{
|
|
id: otherPlanningIssueId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
title: "Earlier accepted plan",
|
|
status: "in_progress",
|
|
workMode: "planning",
|
|
priority: "medium",
|
|
responsibleUserId: "responsible-user",
|
|
assigneeAgentId: agentId,
|
|
identifier: "PAP-9302",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
},
|
|
]);
|
|
await seedAcceptedPlanClaim({
|
|
companyId,
|
|
issueId: otherPlanningIssueId,
|
|
ownerAgentId: agentId,
|
|
status: "in_flight",
|
|
});
|
|
await db.insert(agentTaskSessions).values({
|
|
companyId,
|
|
agentId,
|
|
adapterType: "codex_local",
|
|
taskKey: issueId,
|
|
sessionParamsJson: {
|
|
sessionId: "stale-cross-issue-session",
|
|
cwd: repoRoot,
|
|
},
|
|
sessionDisplayId: "stale-cross-issue-session",
|
|
});
|
|
adapterExecute.mockImplementationOnce(async () => {
|
|
await db.update(issues).set({ status: "done", updatedAt: new Date() }).where(eq(issues.id, issueId));
|
|
return {
|
|
exitCode: 0,
|
|
signal: null,
|
|
timedOut: false,
|
|
sessionParams: { sessionId: "fresh-session" },
|
|
sessionDisplayId: "fresh-session",
|
|
summary: "Suppressed cross-issue accepted-plan continuation.",
|
|
provider: "test",
|
|
model: "test-model",
|
|
};
|
|
});
|
|
|
|
const heartbeat = heartbeatService(db);
|
|
const run = await heartbeat.wakeup(agentId, {
|
|
source: "automation",
|
|
triggerDetail: "system",
|
|
reason: "issue_blockers_resolved",
|
|
payload: {
|
|
issueId,
|
|
interactionId: "interaction-cross-issue",
|
|
interactionKind: "request_confirmation",
|
|
interactionStatus: "accepted",
|
|
mutation: "interaction",
|
|
},
|
|
contextSnapshot: {
|
|
issueId,
|
|
taskId: issueId,
|
|
wakeReason: "issue_blockers_resolved",
|
|
interactionKind: "request_confirmation",
|
|
interactionStatus: "accepted",
|
|
},
|
|
});
|
|
|
|
expect(run).not.toBeNull();
|
|
await vi.waitFor(async () => {
|
|
const latest = await heartbeat.getRun(run!.id);
|
|
expect(latest?.status).toBe("succeeded");
|
|
}, { timeout: 10_000 });
|
|
|
|
expect(adapterExecute).toHaveBeenCalledTimes(1);
|
|
const adapterInput = adapterExecute.mock.calls[0]?.[0] as {
|
|
runtime: { sessionId: string | null; sessionParams: Record<string, unknown> | null };
|
|
context: Record<string, unknown>;
|
|
};
|
|
expect(adapterInput.runtime.sessionId).toBeNull();
|
|
expect(adapterInput.runtime.sessionParams).toBeNull();
|
|
expect(adapterInput.context.acceptedPlanWakeRouting).toEqual(expect.objectContaining({
|
|
reason: "other_issue_claim_in_flight",
|
|
otherActiveClaimIssueId: otherPlanningIssueId,
|
|
otherActiveClaimIdentifier: "PAP-9302",
|
|
}));
|
|
expect(adapterInput.context.paperclipTaskMarkdown).toContain("Make the plan only.");
|
|
expect(adapterInput.context.paperclipTaskMarkdown).not.toContain("Create child issues from the approved plan only");
|
|
}, 20_000);
|
|
|
|
it("guards cross-issue accepted-plan retries even when the waking issue is standard work mode", async () => {
|
|
const companyId = randomUUID();
|
|
const projectId = randomUUID();
|
|
const projectWorkspaceId = randomUUID();
|
|
const issueId = randomUUID();
|
|
const otherPlanningIssueId = randomUUID();
|
|
const agentId = randomUUID();
|
|
const repoRoot = await createGitRepo();
|
|
tempRoots.push(repoRoot);
|
|
|
|
await instanceSettingsService(db).updateExperimental({
|
|
enableIsolatedWorkspaces: false,
|
|
});
|
|
await db.insert(companies).values({
|
|
id: companyId,
|
|
name: "Acme",
|
|
issuePrefix: `T${companyId.replace(/-/g, "").slice(0, 6).toUpperCase()}`,
|
|
status: "active",
|
|
defaultResponsibleUserId: "responsible-user",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await grantResponsibleUser(companyId);
|
|
await db.insert(projects).values({
|
|
id: projectId,
|
|
companyId,
|
|
name: "Accepted Plan Routing",
|
|
status: "active",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(projectWorkspaces).values({
|
|
id: projectWorkspaceId,
|
|
companyId,
|
|
projectId,
|
|
name: "Primary",
|
|
cwd: repoRoot,
|
|
isPrimary: true,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(agents).values({
|
|
id: agentId,
|
|
companyId,
|
|
name: "CodexCoder",
|
|
role: "engineer",
|
|
status: "idle",
|
|
adapterType: "codex_local",
|
|
adapterConfig: {},
|
|
runtimeConfig: {},
|
|
permissions: {},
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(issues).values([
|
|
{
|
|
id: issueId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
title: "Implementation wake after accepted plan",
|
|
status: "in_progress",
|
|
workMode: "standard",
|
|
priority: "medium",
|
|
responsibleUserId: "responsible-user",
|
|
assigneeAgentId: agentId,
|
|
identifier: "PAP-9401",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
},
|
|
{
|
|
id: otherPlanningIssueId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
title: "Earlier accepted plan",
|
|
status: "in_progress",
|
|
workMode: "planning",
|
|
priority: "medium",
|
|
responsibleUserId: "responsible-user",
|
|
assigneeAgentId: agentId,
|
|
identifier: "PAP-9402",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
},
|
|
]);
|
|
await seedAcceptedPlanClaim({
|
|
companyId,
|
|
issueId: otherPlanningIssueId,
|
|
ownerAgentId: agentId,
|
|
status: "in_flight",
|
|
});
|
|
await db.insert(agentTaskSessions).values({
|
|
companyId,
|
|
agentId,
|
|
adapterType: "codex_local",
|
|
taskKey: issueId,
|
|
sessionParamsJson: {
|
|
sessionId: "stale-standard-cross-issue-session",
|
|
cwd: repoRoot,
|
|
},
|
|
sessionDisplayId: "stale-standard-cross-issue-session",
|
|
});
|
|
adapterExecute.mockImplementationOnce(async () => {
|
|
await db.update(issues).set({ status: "done", updatedAt: new Date() }).where(eq(issues.id, issueId));
|
|
return {
|
|
exitCode: 0,
|
|
signal: null,
|
|
timedOut: false,
|
|
sessionParams: { sessionId: "fresh-session" },
|
|
sessionDisplayId: "fresh-session",
|
|
summary: "Suppressed cross-issue accepted-plan continuation for a standard-work wake.",
|
|
provider: "test",
|
|
model: "test-model",
|
|
};
|
|
});
|
|
|
|
const heartbeat = heartbeatService(db);
|
|
const run = await heartbeat.wakeup(agentId, {
|
|
source: "automation",
|
|
triggerDetail: "system",
|
|
reason: "issue_commented",
|
|
payload: {
|
|
issueId,
|
|
interactionId: "interaction-standard-cross-issue",
|
|
interactionKind: "request_confirmation",
|
|
interactionStatus: "accepted",
|
|
mutation: "interaction",
|
|
},
|
|
contextSnapshot: {
|
|
issueId,
|
|
taskId: issueId,
|
|
wakeReason: "issue_commented",
|
|
interactionKind: "request_confirmation",
|
|
interactionStatus: "accepted",
|
|
forceFreshSession: true,
|
|
workspaceRefreshReason: "accepted_plan_confirmation",
|
|
},
|
|
});
|
|
|
|
expect(run).not.toBeNull();
|
|
await vi.waitFor(async () => {
|
|
const latest = await heartbeat.getRun(run!.id);
|
|
expect(latest?.status).toBe("succeeded");
|
|
}, { timeout: 10_000 });
|
|
|
|
expect(adapterExecute).toHaveBeenCalledTimes(1);
|
|
const adapterInput = adapterExecute.mock.calls[0]?.[0] as {
|
|
runtime: { sessionId: string | null; sessionParams: Record<string, unknown> | null };
|
|
context: Record<string, unknown>;
|
|
};
|
|
expect(adapterInput.runtime.sessionId).toBeNull();
|
|
expect(adapterInput.runtime.sessionParams).toBeNull();
|
|
expect(adapterInput.context.acceptedPlanWakeRouting).toEqual(expect.objectContaining({
|
|
reason: "other_issue_claim_in_flight",
|
|
otherActiveClaimIssueId: otherPlanningIssueId,
|
|
otherActiveClaimIdentifier: "PAP-9402",
|
|
}));
|
|
expect(adapterInput.context.paperclipTaskMarkdown).toContain("Issue: \"PAP-9401\"");
|
|
expect(adapterInput.context.paperclipTaskMarkdown).not.toContain("Create child issues from the approved plan only");
|
|
}, 20_000);
|
|
|
|
it("preserves accepted-plan instructions but replaces a pre-identity session when the wake issue owns the in-flight claim", async () => {
|
|
const companyId = randomUUID();
|
|
const projectId = randomUUID();
|
|
const projectWorkspaceId = randomUUID();
|
|
const issueId = randomUUID();
|
|
const agentId = randomUUID();
|
|
const repoRoot = await createGitRepo();
|
|
tempRoots.push(repoRoot);
|
|
|
|
await instanceSettingsService(db).updateExperimental({
|
|
enableIsolatedWorkspaces: false,
|
|
});
|
|
await db.insert(companies).values({
|
|
id: companyId,
|
|
name: "Acme",
|
|
issuePrefix: `T${companyId.replace(/-/g, "").slice(0, 6).toUpperCase()}`,
|
|
status: "active",
|
|
defaultResponsibleUserId: "responsible-user",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await grantResponsibleUser(companyId);
|
|
await db.insert(projects).values({
|
|
id: projectId,
|
|
companyId,
|
|
name: "Accepted Plan Retry",
|
|
status: "active",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(projectWorkspaces).values({
|
|
id: projectWorkspaceId,
|
|
companyId,
|
|
projectId,
|
|
name: "Primary",
|
|
cwd: repoRoot,
|
|
isPrimary: true,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(agents).values({
|
|
id: agentId,
|
|
companyId,
|
|
name: "CodexCoder",
|
|
role: "engineer",
|
|
status: "idle",
|
|
adapterType: "codex_local",
|
|
adapterConfig: {},
|
|
runtimeConfig: {},
|
|
permissions: {},
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await db.insert(issues).values({
|
|
id: issueId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
title: "Accepted plan retry",
|
|
status: "in_progress",
|
|
workMode: "planning",
|
|
priority: "medium",
|
|
responsibleUserId: "responsible-user",
|
|
assigneeAgentId: agentId,
|
|
identifier: "PAP-9303",
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
});
|
|
await seedAcceptedPlanClaim({
|
|
companyId,
|
|
issueId,
|
|
ownerAgentId: agentId,
|
|
status: "in_flight",
|
|
});
|
|
await db.insert(agentTaskSessions).values({
|
|
companyId,
|
|
agentId,
|
|
adapterType: "codex_local",
|
|
taskKey: issueId,
|
|
sessionParamsJson: {
|
|
sessionId: "accepted-plan-retry-session",
|
|
cwd: repoRoot,
|
|
},
|
|
sessionDisplayId: "accepted-plan-retry-session",
|
|
});
|
|
adapterExecute.mockImplementationOnce(async () => {
|
|
await db.update(issues).set({ status: "done", updatedAt: new Date() }).where(eq(issues.id, issueId));
|
|
return {
|
|
exitCode: 0,
|
|
signal: null,
|
|
timedOut: false,
|
|
sessionParams: { sessionId: "accepted-plan-retry-session" },
|
|
sessionDisplayId: "accepted-plan-retry-session",
|
|
summary: "Resumed accepted-plan continuation for the same issue.",
|
|
provider: "test",
|
|
model: "test-model",
|
|
};
|
|
});
|
|
|
|
const heartbeat = heartbeatService(db);
|
|
const run = await heartbeat.wakeup(agentId, {
|
|
source: "automation",
|
|
triggerDetail: "system",
|
|
reason: "issue_blockers_resolved",
|
|
payload: {
|
|
issueId,
|
|
interactionId: "interaction-same-issue",
|
|
interactionKind: "request_confirmation",
|
|
interactionStatus: "accepted",
|
|
mutation: "interaction",
|
|
},
|
|
contextSnapshot: {
|
|
issueId,
|
|
taskId: issueId,
|
|
wakeReason: "issue_blockers_resolved",
|
|
interactionKind: "request_confirmation",
|
|
interactionStatus: "accepted",
|
|
},
|
|
});
|
|
|
|
expect(run).not.toBeNull();
|
|
await vi.waitFor(async () => {
|
|
const latest = await heartbeat.getRun(run!.id);
|
|
expect(latest?.status).toBe("succeeded");
|
|
}, { timeout: 10_000 });
|
|
|
|
expect(adapterExecute).toHaveBeenCalledTimes(1);
|
|
const adapterInput = adapterExecute.mock.calls[0]?.[0] as {
|
|
runtime: { sessionId: string | null; sessionParams: Record<string, unknown> | null };
|
|
context: Record<string, unknown>;
|
|
};
|
|
// The old process predates identity injection and must be replaced.
|
|
expect(adapterInput.runtime.sessionId).toBeNull();
|
|
expect(adapterInput.context.acceptedPlanWakeRouting).toBeUndefined();
|
|
expect(adapterInput.context.paperclipTaskMarkdown).toContain(
|
|
"Implement the accepted plan on this issue when the work is small and cohesive.",
|
|
);
|
|
}, 20_000);
|
|
});
|