@cat-factory/server 0.103.1 → 0.104.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agents/ContainerAgentExecutor.d.ts +5 -5
- package/dist/agents/ContainerAgentExecutor.d.ts.map +1 -1
- package/dist/agents/ContainerAgentExecutor.js +81 -3
- package/dist/agents/ContainerAgentExecutor.js.map +1 -1
- package/dist/agents/jobBody.d.ts +22 -46
- package/dist/agents/jobBody.d.ts.map +1 -1
- package/dist/agents/jobBody.js +65 -9
- package/dist/agents/jobBody.js.map +1 -1
- package/dist/agents/prompts.d.ts +8 -0
- package/dist/agents/prompts.d.ts.map +1 -1
- package/dist/agents/prompts.js +27 -4
- package/dist/agents/prompts.js.map +1 -1
- package/dist/modules/artifacts/imageArtifacts.d.ts +0 -7
- package/dist/modules/artifacts/imageArtifacts.d.ts.map +1 -1
- package/dist/modules/artifacts/imageArtifacts.js +1 -1
- package/dist/modules/artifacts/imageArtifacts.js.map +1 -1
- package/dist/modules/providers/ApiKeyController.d.ts +0 -2
- package/dist/modules/providers/ApiKeyController.d.ts.map +1 -1
- package/dist/modules/providers/ApiKeyController.js +1 -9
- package/dist/modules/providers/ApiKeyController.js.map +1 -1
- package/dist/modules/publicApi/PublicApiController.d.ts +0 -3
- package/dist/modules/publicApi/PublicApiController.d.ts.map +1 -1
- package/dist/modules/publicApi/PublicApiController.js +1 -1
- package/dist/modules/publicApi/PublicApiController.js.map +1 -1
- package/dist/modules/publicApi/PublicApiKeyController.d.ts +0 -4
- package/dist/modules/publicApi/PublicApiKeyController.d.ts.map +1 -1
- package/dist/modules/publicApi/PublicApiKeyController.js +1 -1
- package/dist/modules/publicApi/PublicApiKeyController.js.map +1 -1
- package/dist/modules/webSearch/upstreams.d.ts +0 -4
- package/dist/modules/webSearch/upstreams.d.ts.map +1 -1
- package/dist/modules/webSearch/upstreams.js +1 -1
- package/dist/modules/webSearch/upstreams.js.map +1 -1
- package/dist/modules/workspaces/WorkspaceController.d.ts +0 -2
- package/dist/modules/workspaces/WorkspaceController.d.ts.map +1 -1
- package/dist/modules/workspaces/WorkspaceController.js +1 -1
- package/dist/modules/workspaces/WorkspaceController.js.map +1 -1
- package/dist/persistence/rpc.d.ts +2 -1
- package/dist/persistence/rpc.d.ts.map +1 -1
- package/package.json +6 -6
|
@@ -56,12 +56,12 @@ export type EnsureWorkBranch = (repo: RepoTarget, branch: string, options: {
|
|
|
56
56
|
create: boolean;
|
|
57
57
|
}) => Promise<boolean>;
|
|
58
58
|
/** A subscription token leased from the workspace's pool for a vendor. */
|
|
59
|
-
|
|
59
|
+
interface LeasedSubscriptionToken {
|
|
60
60
|
tokenId: string;
|
|
61
61
|
secret: string;
|
|
62
62
|
}
|
|
63
63
|
/** Lease the least-loaded subscription token for a vendor, or throw if none. */
|
|
64
|
-
|
|
64
|
+
type LeaseSubscriptionToken = (workspaceId: string, vendor: SubscriptionVendor) => Promise<LeasedSubscriptionToken>;
|
|
65
65
|
/**
|
|
66
66
|
* Lease the run-initiator's OWN activated personal credential for an individual-usage
|
|
67
67
|
* vendor (Claude). Scoped to the run + user (not pooled); throws a
|
|
@@ -69,11 +69,11 @@ export type LeaseSubscriptionToken = (workspaceId: string, vendor: SubscriptionV
|
|
|
69
69
|
* their password). Returns just the raw secret — no token id, since there is no pool
|
|
70
70
|
* rotation/usage to attribute for a single-user credential.
|
|
71
71
|
*/
|
|
72
|
-
|
|
72
|
+
type LeasePersonalSubscriptionToken = (executionId: string, userId: string, vendor: SubscriptionVendor) => Promise<{
|
|
73
73
|
secret: string;
|
|
74
74
|
}>;
|
|
75
75
|
/** Fold a finished subscription job's usage into the leased token + telemetry. */
|
|
76
|
-
|
|
76
|
+
type RecordSubscriptionUsage = (workspaceId: string, tokenId: string, usage: {
|
|
77
77
|
inputTokens: number;
|
|
78
78
|
outputTokens: number;
|
|
79
79
|
}) => Promise<void>;
|
|
@@ -85,7 +85,7 @@ export type RecordSubscriptionUsage = (workspaceId: string, tokenId: string, usa
|
|
|
85
85
|
* produces telemetry), unlike {@link RecordSubscriptionUsage}. The payload is the
|
|
86
86
|
* orchestration recorder's own {@link HarnessCallsRecordInput}, so the two can't drift.
|
|
87
87
|
*/
|
|
88
|
-
|
|
88
|
+
type RecordHarnessCalls = (input: HarnessCallsRecordInput) => Promise<void>;
|
|
89
89
|
/**
|
|
90
90
|
* Strip any embedded `user:pass@` userinfo from a URL before it is stored in an
|
|
91
91
|
* observability snapshot. The allow-list promises "never a credential-bearing URL", but
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContainerAgentExecutor.d.ts","sourceRoot":"","sources":["../../src/agents/ContainerAgentExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EAEvB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,QAAQ,EAKb,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAA;AAS5B,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,YAAY,EAOlB,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"ContainerAgentExecutor.d.ts","sourceRoot":"","sources":["../../src/agents/ContainerAgentExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import { resolveInstanceTypeId } from '@cat-factory/contracts';
|
|
|
4
4
|
import { agentTuningFor, DOC_WRITER_KIND, defaultAgentKindRegistry, isProxyableProvider, isReadOnlyAgentKind, webResearchGuidanceFor, } from '@cat-factory/agents';
|
|
5
5
|
import { ModelRouter } from './ModelRouter.js';
|
|
6
6
|
import { toRunResult } from './containerAgentResult.js';
|
|
7
|
-
import { buildKindBody, renderMultiRepoWorkspaceSection, renderReferenceReposSection, } from './jobBody.js';
|
|
8
|
-
import { UI_TESTER_AGENT_KIND } from '@cat-factory/orchestration';
|
|
7
|
+
import { buildKindBody, renderMergerMultiRepoSection, renderMultiRepoWorkspaceSection, renderReferenceReposSection, } from './jobBody.js';
|
|
8
|
+
import { CONFLICT_RESOLVER_AGENT_KIND, MERGER_AGENT_KIND, UI_TESTER_AGENT_KIND, } from '@cat-factory/orchestration';
|
|
9
9
|
import { RunnerJobClient } from './RunnerJobClient.js';
|
|
10
10
|
/**
|
|
11
11
|
* The repo spec every container job body carries: clone coordinates plus, for a
|
|
@@ -674,6 +674,10 @@ export class ContainerAgentExecutor {
|
|
|
674
674
|
let peerRepos;
|
|
675
675
|
let multiRepoSection;
|
|
676
676
|
let commonForKind = common;
|
|
677
|
+
// The repo target the per-kind body builds against — the task's own service by default, but
|
|
678
|
+
// swapped to a PEER repo when the conflicts gate targets the conflict-resolver at a connected
|
|
679
|
+
// service (see the conflict-resolver block below).
|
|
680
|
+
let repoForKind = repo;
|
|
677
681
|
const involvedServices = context.involvedServices ?? [];
|
|
678
682
|
const fansOutMultiRepo = MULTI_REPO_FANOUT_BUILTIN_KINDS.has(context.agentKind) ||
|
|
679
683
|
this.agentKindRegistry.fansOutMultiRepo(context.agentKind);
|
|
@@ -708,6 +712,80 @@ export class ContainerAgentExecutor {
|
|
|
708
712
|
}
|
|
709
713
|
}
|
|
710
714
|
}
|
|
715
|
+
// Conflict-resolver PEER targeting (service-connections phase 4 follow-up): when the
|
|
716
|
+
// conflicts gate detected the conflict on a connected involved service's repo, it hands the
|
|
717
|
+
// resolver `context.conflictTarget`. Point the (single-repo) resolver at that PEER repo —
|
|
718
|
+
// resolve its target and swap `repo`/`common.repo` — instead of the task's own service. The
|
|
719
|
+
// resolver clones the peer's PR (work) branch and merges the peer's base in (jobBody pins the
|
|
720
|
+
// branch to the shared work branch and reads `mergeBase` off this swapped target). An own-repo
|
|
721
|
+
// conflict carries no `frameId`, so this is a no-op and the resolver targets the own service.
|
|
722
|
+
const conflictFrameId = context.agentKind === CONFLICT_RESOLVER_AGENT_KIND
|
|
723
|
+
? context.conflictTarget?.frameId
|
|
724
|
+
: undefined;
|
|
725
|
+
if (conflictFrameId && this.deps.resolveRepoTargets) {
|
|
726
|
+
const { checkouts } = await this.deps.resolveRepoTargets(workspaceId, blockId, [conflictFrameId], repo);
|
|
727
|
+
const peer = checkouts.find((c) => !c.primary && c.involved.some((i) => i.frameId === conflictFrameId));
|
|
728
|
+
// Fail fast if the tagged peer can't be resolved (e.g. a stale/missing repo projection row):
|
|
729
|
+
// falling through would silently point the resolver at the OWN repo, which has no conflict, so
|
|
730
|
+
// every re-probe would re-dispatch until the whole attempt budget is spent on the wrong repo
|
|
731
|
+
// and the run gives up misattributing the failure. A loud dispatch error surfaces the
|
|
732
|
+
// inconsistency immediately instead.
|
|
733
|
+
if (!peer) {
|
|
734
|
+
throw new Error(`Conflict-resolver could not resolve the conflicted peer repo (frame '${conflictFrameId}') ` +
|
|
735
|
+
`for block '${blockId}' — its repo projection may be missing or unlinked.`);
|
|
736
|
+
}
|
|
737
|
+
const origin = this.deps.resolveRepoOrigin ?? githubRepoOrigin;
|
|
738
|
+
repoForKind = peer.target;
|
|
739
|
+
commonForKind = { ...common, repo: buildRepoSpec(peer.target, origin(peer.target)) };
|
|
740
|
+
}
|
|
741
|
+
// Merger combined-diff (service-connections phase 4 follow-up): a multi-repo task opened one PR
|
|
742
|
+
// per changed repo. The merger scores the COMBINED change by cloning EVERY PR's repo as a
|
|
743
|
+
// read-only sibling at its PR branch (the read-only explore fan-out) and diffing each vs its
|
|
744
|
+
// base. Driven by the PRs that actually exist (`block.peerPullRequests`), not the involved-
|
|
745
|
+
// services set — a peer with no change opened no PR, so there is nothing to score there. The
|
|
746
|
+
// own-service PR rides the primary checkout (the merger clones `pr` full); the peers are added
|
|
747
|
+
// here with their own PR branch to check out, plus a section naming the sibling diff commands.
|
|
748
|
+
const peerPrs = context.block.peerPullRequests ?? [];
|
|
749
|
+
if (context.agentKind === MERGER_AGENT_KIND &&
|
|
750
|
+
peerPrs.length > 0 &&
|
|
751
|
+
this.deps.resolveRepoTargets) {
|
|
752
|
+
const frameIds = peerPrs.map((p) => p.frameId).filter((f) => !!f);
|
|
753
|
+
if (frameIds.length > 0) {
|
|
754
|
+
const { checkouts } = await this.deps.resolveRepoTargets(workspaceId, blockId, frameIds, repo);
|
|
755
|
+
const origin = this.deps.resolveRepoOrigin ?? githubRepoOrigin;
|
|
756
|
+
const legs = [];
|
|
757
|
+
for (const pr of peerPrs) {
|
|
758
|
+
if (!pr.frameId)
|
|
759
|
+
continue;
|
|
760
|
+
const checkout = checkouts.find((c) => !c.primary && c.involved.some((i) => i.frameId === pr.frameId));
|
|
761
|
+
if (!checkout)
|
|
762
|
+
continue;
|
|
763
|
+
legs.push({
|
|
764
|
+
spec: buildRepoSpec(checkout.target, origin(checkout.target)),
|
|
765
|
+
frameId: pr.frameId,
|
|
766
|
+
cloneBranch: pr.ref.branch ?? workBranch,
|
|
767
|
+
target: checkout.target,
|
|
768
|
+
});
|
|
769
|
+
}
|
|
770
|
+
if (legs.length > 0) {
|
|
771
|
+
peerRepos = legs.map((l) => ({
|
|
772
|
+
repo: l.spec,
|
|
773
|
+
frameId: l.frameId,
|
|
774
|
+
cloneBranch: l.cloneBranch,
|
|
775
|
+
}));
|
|
776
|
+
// The own service rides the primary checkout at its PR head (clone `pr`, or base when the
|
|
777
|
+
// own service had no change); list it first so the section names its diff command too.
|
|
778
|
+
multiRepoSection = renderMergerMultiRepoSection([
|
|
779
|
+
{ owner: repo.owner, name: repo.name, baseBranch: repo.baseBranch },
|
|
780
|
+
...legs.map((l) => ({
|
|
781
|
+
owner: l.target.owner,
|
|
782
|
+
name: l.target.name,
|
|
783
|
+
baseBranch: l.target.baseBranch,
|
|
784
|
+
})),
|
|
785
|
+
]);
|
|
786
|
+
}
|
|
787
|
+
}
|
|
788
|
+
}
|
|
711
789
|
// Read-only reference repos (document-authoring tasks): independent of the fan-out above —
|
|
712
790
|
// the doc-writer clones each attached repo as a READ-ONLY sibling checkout it may read but
|
|
713
791
|
// never writes to. The spec carries NO branch/PR fields, so it is structurally unpushable;
|
|
@@ -750,7 +828,7 @@ export class ContainerAgentExecutor {
|
|
|
750
828
|
const { body, kind } = buildKindBody(promptContext, {
|
|
751
829
|
common: commonForKind,
|
|
752
830
|
webTools,
|
|
753
|
-
repo,
|
|
831
|
+
repo: repoForKind,
|
|
754
832
|
workBranch,
|
|
755
833
|
workBranchReady,
|
|
756
834
|
...(peerRepos ? { peerRepos } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContainerAgentExecutor.js","sourceRoot":"","sources":["../../src/agents/ContainerAgentExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ContainerAgentExecutor.js","sourceRoot":"","sources":["../../src/agents/ContainerAgentExecutor.ts"],"names":[],"mappings":"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"}
|
package/dist/agents/jobBody.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AgentRunContext,
|
|
1
|
+
import type { AgentRunContext, RunnerDispatchKind } from '@cat-factory/kernel';
|
|
2
2
|
import { type AgentKindRegistry } from '@cat-factory/agents';
|
|
3
3
|
import type { RepoTarget } from './ContainerAgentExecutor.js';
|
|
4
4
|
import type { RepoCheckout } from './resolveRepoTarget.js';
|
|
@@ -20,15 +20,17 @@ export interface KindBodyParts {
|
|
|
20
20
|
workBranch: string;
|
|
21
21
|
workBranchReady: boolean;
|
|
22
22
|
/**
|
|
23
|
-
* Peer repos to clone as siblings
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
23
|
+
* Peer repos to clone as siblings during a MULTI-REPO run (service-connections phase 3–4) —
|
|
24
|
+
* each an origin-resolved harness `RepoSpec` plus the involved service frame it belongs to. The
|
|
25
|
+
* coding body adds the shared work branch + the same PR shape as the primary (coder/ci-fixer);
|
|
26
|
+
* the read-only explore body (bug-investigator, merger) forwards them for sibling cloning. A
|
|
27
|
+
* `cloneBranch` (merger) pins which branch a read-only peer is checked out at — its PR branch,
|
|
28
|
+
* so the combined diff sees the PR change — else the peer is cloned at its default branch.
|
|
28
29
|
*/
|
|
29
30
|
peerRepos?: {
|
|
30
31
|
repo: Record<string, unknown>;
|
|
31
32
|
frameId?: string;
|
|
33
|
+
cloneBranch?: string;
|
|
32
34
|
}[];
|
|
33
35
|
/**
|
|
34
36
|
* The backend-rendered "Multi-repo workspace" system-prompt section (which repo is primary,
|
|
@@ -64,26 +66,6 @@ export declare function buildKindBody(context: AgentRunContext, parts: KindBodyP
|
|
|
64
66
|
body: Record<string, unknown>;
|
|
65
67
|
kind: RunnerDispatchKind;
|
|
66
68
|
};
|
|
67
|
-
/**
|
|
68
|
-
* Build the generic `agent` job body for a registered kind from its declarative
|
|
69
|
-
* {@link AgentStepSpec} — the single dispatch path that replaces the per-kind cases as
|
|
70
|
-
* built-ins migrate. `container-explore` clones a branch read-only and returns prose
|
|
71
|
-
* (or, for `output.kind==='structured'`, a parsed `custom` JSON object the kind's
|
|
72
|
-
* post-op renders from); `container-coding` clones, edits, pushes and (off the work
|
|
73
|
-
* branch) opens a PR. The clone target maps `base`/`pr`/`work` to a concrete branch
|
|
74
|
-
* exactly as the built-in bodies do.
|
|
75
|
-
*/
|
|
76
|
-
export declare function buildRegisteredAgentBody(context: AgentRunContext, parts: KindBodyParts, step: AgentStepSpec, roleSystemPrompt: string, registry: AgentKindRegistry,
|
|
77
|
-
/**
|
|
78
|
-
* The concrete task prompt. Defaults to the generic `userPromptFor` (block context +
|
|
79
|
-
* prior outputs) — the same prompt a registered custom kind gets. A migrated built-in
|
|
80
|
-
* (merger / on-call) overrides it with its bespoke, JSON-instructing prompt so its
|
|
81
|
-
* body matches the old per-kind handler's.
|
|
82
|
-
*/
|
|
83
|
-
userPrompt?: string): {
|
|
84
|
-
body: Record<string, unknown>;
|
|
85
|
-
kind: RunnerDispatchKind;
|
|
86
|
-
};
|
|
87
69
|
/**
|
|
88
70
|
* Render the "Multi-repo workspace" system-prompt section for a multi-service coding run
|
|
89
71
|
* (service-connections phase 3). Names the primary repo (the task's own service) and, for
|
|
@@ -102,6 +84,20 @@ userPrompt?: string): {
|
|
|
102
84
|
* a single PR instead.
|
|
103
85
|
*/
|
|
104
86
|
export declare function renderMultiRepoWorkspaceSection(checkouts: RepoCheckout[], involvedServices: NonNullable<AgentRunContext['involvedServices']>): string;
|
|
87
|
+
/**
|
|
88
|
+
* Render the "Multi-repo pull request" system-prompt section for a `merger` scoring a multi-repo
|
|
89
|
+
* task (service-connections phase 4): the task opened one PR per changed repo, and the merger
|
|
90
|
+
* assesses the COMBINED change. Each repo is a READ-ONLY sibling checkout (own-service first, then
|
|
91
|
+
* peers) already on its PR branch, so the section names each repo's sibling directory (matching the
|
|
92
|
+
* harness's `siblingDir`) and the exact per-repo diff command, and instructs the agent to weigh the
|
|
93
|
+
* whole cross-repo change as ONE assessment. Distinct from {@link renderMultiRepoWorkspaceSection}
|
|
94
|
+
* (which is for a coding fan-out — "commit inside each, one PR per repo"); the merger writes nothing.
|
|
95
|
+
*/
|
|
96
|
+
export declare function renderMergerMultiRepoSection(repos: {
|
|
97
|
+
owner: string;
|
|
98
|
+
name: string;
|
|
99
|
+
baseBranch: string;
|
|
100
|
+
}[]): string;
|
|
105
101
|
/**
|
|
106
102
|
* Render the "Reference repositories" system-prompt section for a document-authoring run. Attaching
|
|
107
103
|
* reference repos turns a doc-writer run into a multi-repo layout: the harness checks out the doc
|
|
@@ -112,24 +108,4 @@ export declare function renderMultiRepoWorkspaceSection(checkouts: RepoCheckout[
|
|
|
112
108
|
* MUST stay byte-identical to {@link siblingCheckoutDir}.
|
|
113
109
|
*/
|
|
114
110
|
export declare function renderReferenceReposSection(primary: RepoTarget, references: RepoTarget[]): string;
|
|
115
|
-
/**
|
|
116
|
-
* Build the generic `agent` body for a BUILT-IN container kind being migrated onto the
|
|
117
|
-
* manifest-driven path (the Task-5 strangler), or undefined when `context.agentKind` is
|
|
118
|
-
* not a migrated built-in (the caller falls through to the remaining bespoke switch). Each
|
|
119
|
-
* migrated kind is expressed as a synthesized {@link AgentStepSpec} routed through
|
|
120
|
-
* {@link buildRegisteredAgentBody} — the SAME dispatch a registered custom kind takes — so
|
|
121
|
-
* there is no bespoke harness handler:
|
|
122
|
-
* - `ci-fixer` / `fixer`: coding-on-PR (clone the PR branch, push back, no new PR; a
|
|
123
|
-
* no-op is non-fatal). Requires the implementation PR branch.
|
|
124
|
-
* - `merger` / `on-call`: read-only structured explore (full clone) that returns ONLY a
|
|
125
|
-
* JSON assessment; the conservative coercion that used to live in the harness runs
|
|
126
|
-
* backend-side in {@link toRunResult}.
|
|
127
|
-
* - `conflict-resolver`: coding (full clone of the PR branch) with a `mergeBase` — the
|
|
128
|
-
* harness merges the base in to surface the conflicts, the agent resolves them, and the
|
|
129
|
-
* harness completes the merge commit + pushes back onto the same branch (no new PR).
|
|
130
|
-
*/
|
|
131
|
-
export declare function buildMigratedBuiltInBody(context: AgentRunContext, parts: KindBodyParts, roleSystemPrompt: string, registry: AgentKindRegistry): {
|
|
132
|
-
body: Record<string, unknown>;
|
|
133
|
-
kind: RunnerDispatchKind;
|
|
134
|
-
} | undefined;
|
|
135
111
|
//# sourceMappingURL=jobBody.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobBody.d.ts","sourceRoot":"","sources":["../../src/agents/jobBody.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"jobBody.d.ts","sourceRoot":"","sources":["../../src/agents/jobBody.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAiB,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC7F,OAAO,EACL,KAAK,iBAAiB,EAQvB,MAAM,qBAAqB,CAAA;AAqC5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAE1D;;;;;;;;;;GAUG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjC,IAAI,EAAE,UAAU,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;IACxB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACvF;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;;;;OAKG;IACH,cAAc,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EAAE,CAAA;IACpD;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC/B;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,iBAAiB,GAC1B;IAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAkG7D;AAmMD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,YAAY,EAAE,EACzB,gBAAgB,EAAE,WAAW,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,GACjE,MAAM,CAwER;AAED;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAAE,GAC3D,MAAM,CAoBR;AAQD;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,CAkCjG"}
|
package/dist/agents/jobBody.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { bugFixGuidanceFor, composeBlockSystemPrompt, FOLLOW_UP_GUIDANCE, isContainerBackedCompanion, isReadOnlyAgentKind, systemPromptFor, userPromptFor, } from '@cat-factory/agents';
|
|
2
2
|
import { BLUEPRINTS_AGENT_KIND, CI_FIXER_AGENT_KIND, CONFLICT_RESOLVER_AGENT_KIND, FIXER_AGENT_KIND, MERGER_AGENT_KIND, ON_CALL_AGENT_KIND, SPEC_WRITER_AGENT_KIND, TESTER_AGENT_KIND, UI_TESTER_AGENT_KIND, } from '@cat-factory/orchestration';
|
|
3
3
|
import { INITIATIVE_ANALYST_AGENT_KIND, INITIATIVE_PLANNER_AGENT_KIND } from '@cat-factory/kernel';
|
|
4
|
-
import { BLUEPRINT_SHAPE_HINT, BLUEPRINT_SYSTEM_PROMPT, blueprintUserPrompt, INITIATIVE_ANALYST_SYSTEM_PROMPT, initiativeAnalystUserPrompt, INITIATIVE_PLAN_SHAPE_HINT, INITIATIVE_PLANNER_SYSTEM_PROMPT, initiativePlannerUserPrompt, MERGE_ASSESSMENT_SHAPE_HINT, MERGER_SYSTEM_PROMPT, mergerUserPrompt, ON_CALL_ASSESSMENT_SHAPE_HINT, ON_CALL_SYSTEM_PROMPT, onCallUserPrompt, prBody, SPEC_SHAPE_HINT, SPEC_WRITER_SYSTEM_PROMPT, specWriterUserPrompt, TEST_REPORT_SHAPE_HINT, testerInfraSpec, UI_TEST_REPORT_SHAPE_HINT, } from './prompts.js';
|
|
4
|
+
import { BLUEPRINT_SHAPE_HINT, BLUEPRINT_SYSTEM_PROMPT, blueprintUserPrompt, INITIATIVE_ANALYST_SYSTEM_PROMPT, initiativeAnalystUserPrompt, INITIATIVE_PLAN_SHAPE_HINT, INITIATIVE_PLANNER_SYSTEM_PROMPT, initiativePlannerUserPrompt, MERGE_ASSESSMENT_SHAPE_HINT, MERGER_SYSTEM_PROMPT, mergerMultiRepoUserPrompt, mergerUserPrompt, ON_CALL_ASSESSMENT_SHAPE_HINT, ON_CALL_SYSTEM_PROMPT, onCallUserPrompt, prBody, SPEC_SHAPE_HINT, SPEC_WRITER_SYSTEM_PROMPT, specWriterUserPrompt, TEST_REPORT_SHAPE_HINT, testerInfraSpec, UI_TEST_REPORT_SHAPE_HINT, } from './prompts.js';
|
|
5
5
|
/**
|
|
6
6
|
* Build the per-kind harness job body: the shared `common` fields plus ONLY the delta
|
|
7
7
|
* specific to this kind's harness endpoint (its prompts, the branch it runs on, and
|
|
@@ -113,7 +113,7 @@ function structuredOutputField(output) {
|
|
|
113
113
|
* branch) opens a PR. The clone target maps `base`/`pr`/`work` to a concrete branch
|
|
114
114
|
* exactly as the built-in bodies do.
|
|
115
115
|
*/
|
|
116
|
-
|
|
116
|
+
function buildRegisteredAgentBody(context, parts, step, roleSystemPrompt, registry,
|
|
117
117
|
/**
|
|
118
118
|
* The concrete task prompt. Defaults to the generic `userPromptFor` (block context +
|
|
119
119
|
* prior outputs) — the same prompt a registered custom kind gets. A migrated built-in
|
|
@@ -213,7 +213,13 @@ userPrompt = userPromptFor(context, registry, { materialized: true })) {
|
|
|
213
213
|
// `runMultiRepoExplore` just clones them (`{ repo, frameId }`) and runs the agent at the
|
|
214
214
|
// workspace root. The layout section names each repo/subdir + role.
|
|
215
215
|
const explorePeers = parts.peerRepos?.length
|
|
216
|
-
? parts.peerRepos.map((p) => ({
|
|
216
|
+
? parts.peerRepos.map((p) => ({
|
|
217
|
+
repo: p.repo,
|
|
218
|
+
...(p.frameId ? { frameId: p.frameId } : {}),
|
|
219
|
+
// The merger pins each read-only peer to its PR branch so the combined diff sees the PR
|
|
220
|
+
// change; the bug-investigator omits it (cloned at the repo's default branch).
|
|
221
|
+
...(p.cloneBranch ? { cloneBranch: p.cloneBranch } : {}),
|
|
222
|
+
}))
|
|
217
223
|
: undefined;
|
|
218
224
|
return {
|
|
219
225
|
kind: 'agent',
|
|
@@ -343,6 +349,34 @@ export function renderMultiRepoWorkspaceSection(checkouts, involvedServices) {
|
|
|
343
349
|
}
|
|
344
350
|
return lines.join('\n');
|
|
345
351
|
}
|
|
352
|
+
/**
|
|
353
|
+
* Render the "Multi-repo pull request" system-prompt section for a `merger` scoring a multi-repo
|
|
354
|
+
* task (service-connections phase 4): the task opened one PR per changed repo, and the merger
|
|
355
|
+
* assesses the COMBINED change. Each repo is a READ-ONLY sibling checkout (own-service first, then
|
|
356
|
+
* peers) already on its PR branch, so the section names each repo's sibling directory (matching the
|
|
357
|
+
* harness's `siblingDir`) and the exact per-repo diff command, and instructs the agent to weigh the
|
|
358
|
+
* whole cross-repo change as ONE assessment. Distinct from {@link renderMultiRepoWorkspaceSection}
|
|
359
|
+
* (which is for a coding fan-out — "commit inside each, one PR per repo"); the merger writes nothing.
|
|
360
|
+
*/
|
|
361
|
+
export function renderMergerMultiRepoSection(repos) {
|
|
362
|
+
const lines = [
|
|
363
|
+
'## Multi-repo pull request',
|
|
364
|
+
'',
|
|
365
|
+
'This pull request spans MORE THAN ONE repository (one PR per changed repo). Each repository',
|
|
366
|
+
'below is checked out as a SIBLING directory under your working directory (the workspace root,',
|
|
367
|
+
'which is NOT a git repository), already on its pull-request branch (HEAD). Assess the COMBINED',
|
|
368
|
+
"change: inspect EACH repository's diff against its base, weigh the whole cross-repo change",
|
|
369
|
+
'together, and return ONE assessment covering all of them — NOT one assessment per repo.',
|
|
370
|
+
'',
|
|
371
|
+
"Repositories (run each diff inside that repository's own directory):",
|
|
372
|
+
];
|
|
373
|
+
for (const r of repos) {
|
|
374
|
+
const dir = siblingCheckoutDir(r.owner, r.name);
|
|
375
|
+
lines.push(`- \`${r.owner}/${r.name}\` → \`${dir}/\` (base \`${r.baseBranch}\`): ` +
|
|
376
|
+
`\`cd ${dir} && git fetch origin ${r.baseBranch} && git diff origin/${r.baseBranch}...HEAD\``);
|
|
377
|
+
}
|
|
378
|
+
return lines.join('\n');
|
|
379
|
+
}
|
|
346
380
|
/** Append the present (non-empty) system-prompt sections to a base prompt, blank-line separated. */
|
|
347
381
|
function appendSections(base, sections) {
|
|
348
382
|
const present = sections.filter((s) => !!s);
|
|
@@ -408,7 +442,7 @@ export function renderReferenceReposSection(primary, references) {
|
|
|
408
442
|
* harness merges the base in to surface the conflicts, the agent resolves them, and the
|
|
409
443
|
* harness completes the merge commit + pushes back onto the same branch (no new PR).
|
|
410
444
|
*/
|
|
411
|
-
|
|
445
|
+
function buildMigratedBuiltInBody(context, parts, roleSystemPrompt, registry) {
|
|
412
446
|
const { repo } = parts;
|
|
413
447
|
const prBranch = context.block.pullRequest?.branch;
|
|
414
448
|
switch (context.agentKind) {
|
|
@@ -496,21 +530,43 @@ export function buildMigratedBuiltInBody(context, parts, roleSystemPrompt, regis
|
|
|
496
530
|
// is ready" answer and never touched the markers). The backend supplies only a compact
|
|
497
531
|
// task reference for intent.
|
|
498
532
|
case CONFLICT_RESOLVER_AGENT_KIND: {
|
|
499
|
-
|
|
533
|
+
// The branch to resolve on is the shared per-task work branch every repo's PR rides
|
|
534
|
+
// (`cat-factory/<blockId>`, opened via `newBranch: workBranch` for the own service AND
|
|
535
|
+
// every peer). The own PR's recorded branch equals it by construction; `parts.workBranch`
|
|
536
|
+
// is the robust value when the OWN service had no change (no own `pullRequest`) but a
|
|
537
|
+
// PEER repo did (the peer-conflict case — `parts.repo` was swapped to that peer upstream).
|
|
538
|
+
const resolveBranch = prBranch ?? parts.workBranch;
|
|
539
|
+
if (!resolveBranch) {
|
|
500
540
|
throw new Error('Conflict-resolver needs the implementation PR branch to resolve conflicts on');
|
|
501
541
|
}
|
|
502
542
|
const description = context.block.description?.trim();
|
|
503
543
|
const built = buildRegisteredAgentBody(context, parts, { surface: 'container-coding', clone: { branch: 'pr', full: true } }, roleSystemPrompt, registry, `Task: ${context.block.title}${description ? `\n\n${description}` : ''}`);
|
|
504
|
-
|
|
544
|
+
// Pin the clone/push branch to the resolved work branch (the generic `pr`-clone path falls
|
|
545
|
+
// back to the base branch when there is no own PR, which would clone the wrong ref for a
|
|
546
|
+
// peer-only conflict) and merge THIS repo's base in to surface the conflicts.
|
|
547
|
+
return {
|
|
548
|
+
kind: built.kind,
|
|
549
|
+
body: {
|
|
550
|
+
...built.body,
|
|
551
|
+
branch: resolveBranch,
|
|
552
|
+
pushBranch: resolveBranch,
|
|
553
|
+
mergeBase: repo.baseBranch,
|
|
554
|
+
},
|
|
555
|
+
};
|
|
505
556
|
}
|
|
506
557
|
// The merger clones the PR head (full, to diff vs base) and returns ONLY the
|
|
507
|
-
// complexity/risk/impact assessment JSON; the engine performs the real merge.
|
|
508
|
-
|
|
558
|
+
// complexity/risk/impact assessment JSON; the engine performs the real merge. On a MULTI-REPO
|
|
559
|
+
// task (`parts.peerRepos` set) it clones each peer PR's repo as a read-only full sibling too
|
|
560
|
+
// (the explore fan-out) and scores the COMBINED diff — the section naming the sibling
|
|
561
|
+
// checkouts + per-repo diff commands is appended to the system prompt by the explore builder.
|
|
562
|
+
case MERGER_AGENT_KIND: {
|
|
563
|
+
const multiRepo = (parts.peerRepos?.length ?? 0) > 0;
|
|
509
564
|
return buildRegisteredAgentBody(context, parts, {
|
|
510
565
|
surface: 'container-explore',
|
|
511
566
|
clone: { branch: 'pr', full: true },
|
|
512
567
|
output: { kind: 'structured', shapeHint: MERGE_ASSESSMENT_SHAPE_HINT },
|
|
513
|
-
}, MERGER_SYSTEM_PROMPT, registry, mergerUserPrompt(context, repo));
|
|
568
|
+
}, MERGER_SYSTEM_PROMPT, registry, multiRepo ? mergerMultiRepoUserPrompt(context) : mergerUserPrompt(context, repo));
|
|
569
|
+
}
|
|
514
570
|
// The on-call agent clones the BASE branch (full, to locate + diff the merged
|
|
515
571
|
// release commit) and returns ONLY the regression assessment JSON. It is
|
|
516
572
|
// `code-aware` (it reads the released code to correlate the diff with the
|