orizu 0.5.37 → 0.5.39

package/dist/hosted-boot.js

@@ -32,6 +32,7 @@
 import { spawnSync } from 'child_process';
 import { closeSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, unlinkSync, writeSync } from 'fs';
 import { isValidCloudflareArtifactsGitRemote } from './cloudflare-artifacts-git-remote.js';
+import { seedSessionCopy } from './hosted-session-seed.js';
 import { AGENT_GIT_IDENTITY, BEARER_BASENAME, BOOT_CONTEXT_BASENAME, DEFAULT_CACHE_REFRESH_BUFFER_MS, HELPER_SCRIPT_BASENAME, REPO_CRED_CACHE_BASENAME, renderCredentialHelperScript, serializeBootContext, } from './hosted-runtime-assets.js';
 import { INJECTED_ENV_VARS_ENV, closeHostedLoopSession, runHostedLoop, runHostedLoopTurn, startHostedLoopSession, } from './hosted-loop.js';
 import { DEFAULT_EGRESS_CANARY_HOST, DEFAULT_HOSTED_MODEL } from './hosted-loop-lifecycle.js';
@@ -488,6 +489,23 @@ export async function beginRunExecution(opts) {
     }
     throw new Error(`run_started transition failed: ${detail}`);
 }
+/** Mint a `team_read` key (ORI-2280 B1) to learn this session's team copy, so
+ *  the boot can fill an empty session copy from it (ORI-2118). The credential
+ *  helper mints its own keys for the git commands; this one only names the
+ *  remote and lapses on its own (300 s). */
+export async function resolveTeamRemote(opts) {
+    const url = `${opts.baseUrl}/api/cli/workspaces/${encodeURIComponent(opts.workspaceId)}/repo-token`;
+    const minted = await bearerJson(opts.fetchImpl, url, opts.bearer, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ purpose: 'team_read', sessionId: opts.sessionId }),
+    });
+    const remote = asString(minted.remote);
+    if (asString(minted.provider) !== 'cloudflare_artifacts' || !remote || !isValidCloudflareArtifactsGitRemote(remote)) {
+        throw new Error('team_read response carried no valid Artifacts remote');
+    }
+    return remote;
+}
 /** Mint a session_read repo token to learn the repo full name, then build the
  *  GitHub clone URL (mirrors the operator path's `defaultResolveRepo`). */
 export async function resolveRepo(opts) {
@@ -526,6 +544,9 @@ export async function resolveRepo(opts) {
     // reused after we read `repo` from it.
     return { repoFullName, cloneUrl: `https://github.com/${repoFullName}.git` };
 }
+/** The credential-helper context for the team copy, used only to fill an
+ *  empty session copy (ORI-2118). */
+const TEAM_BOOT_CONTEXT_BASENAME = 'boot-team.json';
 const defaultExec = (cmd, args, opts) => {
     const res = spawnSync(cmd, args, { cwd: opts?.cwd, encoding: 'utf8' });
     return { status: res.status ?? 1, stdout: res.stdout ?? '', stderr: res.stderr ?? '' };
@@ -762,9 +783,33 @@ export async function runHostedBoot(opts) {
         cacheBufferMs: DEFAULT_CACHE_REFRESH_BUFFER_MS,
     };
     writeFile(bootContextAbs, serializeBootContext(bootContext));
+    const helperValue = `!node ${helperScriptAbs} ${bootContextAbs}`;
+    // 4b — ORI-2118: a hosted session's Artifacts copy is created empty (forks
+    // of a busy team copy cannot be cloned), so fill it from the team copy
+    // before the first clone. A copy that already has `main` is left alone.
+    if (isValidCloudflareArtifactsGitRemote(repo.cloneUrl)) {
+        const credentialConfig = (helper) => [`credential.helper=${helper}`, 'credential.useHttpPath=true'];
+        await seedSessionCopy({
+            exec,
+            sessionRemote: repo.cloneUrl,
+            sessionGitConfig: credentialConfig(helperValue),
+            scratchDir: `${sessionDirAbs}/seed.git`,
+            resolveTeam: async () => {
+                const teamRemote = await resolveTeamRemote({ baseUrl: env.baseUrl, workspaceId, sessionId: env.sessionId, bearer: bearer.token, fetchImpl });
+                assertSafeGitValue('teamRemote', teamRemote);
+                const teamContextAbs = `${sessionDirAbs}/${TEAM_BOOT_CONTEXT_BASENAME}`;
+                writeFile(teamContextAbs, serializeBootContext({
+                    ...bootContext,
+                    repoFullName: teamRemote,
+                    host: new URL(teamRemote).host.toLowerCase(),
+                    tokenPurposes: { primary: 'team_read', fallback: 'team_read' },
+                }));
+                return { remote: teamRemote, gitConfig: credentialConfig(`!node ${helperScriptAbs} ${teamContextAbs}`) };
+            },
+        });
+    }
     // 5 — Clone the session branch VIA the pull-mode credential helper (same
     // invocation the operator path makes; no token in the URL/config).
-    const helperValue = `!node ${helperScriptAbs} ${bootContextAbs}`;
     const clone = exec('git', [
         'clone',
         '--depth',

package/dist/hosted-harvest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-harvest.d.ts","sourceRoot":"","sources":["../src/hosted-harvest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAaH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,iFAAiF;AACjF,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,iBAAiB,CAAA;AAExE,MAAM,WAAW,cAAc;IAC7B,iFAAiF;IACjF,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,0EAA0E;IAC1E,aAAa,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,CAAA;IACxB,mFAAmF;IACnF,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,0EAA0E;IAC1E,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACvC,kFAAkF;IAClF,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,qEAAqE;IACrE,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CAAE,GAC/D;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAElD,eAAO,MAAM,mCAAmC,0GAItC,CAAA;AAEV,eAAO,MAAM,iCAAiC,+EAGpC,CAAA;AAEV,eAAO,MAAM,+BAA+B;;;;CAgBlC,CAAA;AAUV,wBAAgB,4BAA4B,CAC1C,UAAU,GAAE,SAAS,MAAM,EAAwC,GAClE,MAAM,GAAG,IAAI,CAEf;AA6GD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAyJrE"}
+{"version":3,"file":"hosted-harvest.d.ts","sourceRoot":"","sources":["../src/hosted-harvest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAaH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,iFAAiF;AACjF,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,iBAAiB,CAAA;AAExE,MAAM,WAAW,cAAc;IAC7B,iFAAiF;IACjF,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,0EAA0E;IAC1E,aAAa,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,CAAA;IACxB,mFAAmF;IACnF,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,0EAA0E;IAC1E,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IACvC,kFAAkF;IAClF,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,qEAAqE;IACrE,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;CAAE,GAC/D;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,oBAAoB,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,qBAAqB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAElD,eAAO,MAAM,mCAAmC,0GAItC,CAAA;AAEV,eAAO,MAAM,iCAAiC,+EAGpC,CAAA;AAEV,eAAO,MAAM,+BAA+B;;;;CAgBlC,CAAA;AAUV,wBAAgB,4BAA4B,CAC1C,UAAU,GAAE,SAAS,MAAM,EAAwC,GAClE,MAAM,GAAG,IAAI,CAEf;AA6GD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,CAmKrE"}

package/dist/hosted-harvest.js

@@ -235,10 +235,20 @@ export function harvestWorkspace(opts) {
         }
         const dirty = status.stdout.trim().length > 0;
         if (dirty) {
-            const add = exec(['add', '-A', '--', '.', ...excludeScaffold]);
+            // Add everything, then unstage the staged skill link. An exclude
+            // pathspec on add makes git exit 1 once bootstrap has ignored
+            // .claude/skills ("paths are ignored"), which is every hosted session
+            // (ORI-2441, git 2.49 in the sandbox). Only the link's own path is reset,
+            // so an agent's edits to a team's tracked skills next to it are saved;
+            // reset, unlike rm --cached, never deletes a tracked file.
+            const add = exec(['add', '-A', '--', '.']);
             if (add.exitCode !== 0) {
                 return { kind: 'work_persist_failed', error: `git add failed: ${detail(add)}` };
             }
+            const unstage = exec(['reset', '-q', '--', '.claude/skills/orizu']);
+            if (unstage.exitCode !== 0) {
+                return { kind: 'work_persist_failed', error: `git reset of .claude/skills/orizu failed: ${detail(unstage)}` };
+            }
             const commit = exec([
                 '-c',
                 `user.name=${opts.author.name}`,

package/dist/hosted-session-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-session-cli.d.ts","sourceRoot":"","sources":["../src/hosted-session-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hosted-session-cli.d.ts","sourceRoot":"","sources":["../src/hosted-session-cli.ts"],"names":[],"mappings":"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"}

package/dist/hosted-session-cli.js

@@ -46,6 +46,7 @@ import { DEFAULT_HOSTED_MODEL, hostedLoopCommand } from './hosted-loop.js';
 import { hostedBootCommand } from './hosted-boot.js';
 import { mergeJobCommand } from './merge-job.js';
 import { workspaceBootstrapJobCommand } from './workspace-bootstrap-job.js';
+import { publishMergeJobCommand } from './publish-merge-job.js';
 import { hostedOptimizationCommand } from './hosted-optimization.js';
 import { writeChildStderr } from './child-output-tee.js';
 import { skilledProposerBakeCommand } from './skilled-proposer-launch.js';
@@ -1179,6 +1180,10 @@ export async function hostedCommand(args, io, deps = {}) {
         if (positional[1] === 'workspace-bootstrap-job') {
             return workspaceBootstrapJobCommand(args, io);
         }
+        // ORI-2280: the one-shot publish merge (coordinator publish-merge job).
+        if (positional[1] === 'publish-merge-job') {
+            return publishMergeJobCommand(args, io);
+        }
         if (positional[1] === 'hosted-optimization') {
             return hostedOptimizationCommand({ ...io, printErr: writeChildStderr });
         }
@@ -1186,7 +1191,7 @@ export async function hostedCommand(args, io, deps = {}) {
             return skilledProposerBakeCommand(io);
         if (positional[1] === 'verify-skilled-proposer-bake')
             return skilledProposerBakeCommand(io, true);
-        io.printErr?.('Usage: orizu internal <hosted-loop --context <path> | hosted-boot | hosted-optimization | merge-job | workspace-bootstrap-job | bake-skilled-proposer-venv | verify-skilled-proposer-bake>');
+        io.printErr?.('Usage: orizu internal <hosted-loop --context <path> | hosted-boot | hosted-optimization | merge-job | workspace-bootstrap-job | publish-merge-job | bake-skilled-proposer-venv | verify-skilled-proposer-bake>');
         return 1;
     }
     const unknownOption = findUnknownOption(args, HOSTED_START_OPTIONS, HOSTED_START_VALUE_OPTIONS);

package/dist/hosted-session-seed.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Fills an empty hosted session copy from its team copy (ORI-2118).
+ *
+ * Artifacts forks of a team copy whose history has a few file-adding commits
+ * cannot be cloned or pushed to (measured 2026-10-03, binding and REST). The
+ * broker therefore creates the session copy EMPTY, and the sandbox boot fills
+ * it here before its first clone: a bare clone of the team copy's `main`, then
+ * a push of that `main` into the session copy. A Worker cannot run git, so
+ * this is the first place in session start that can.
+ *
+ * It fills a copy only when the copy has no branches at all, which is what a
+ * freshly created copy looks like. A retried or resumed boot finds `main` and
+ * does nothing, so it never overwrites the agent's work, and a working
+ * repository whose content lives on another branch is never touched. The
+ * push is never forced; if another boot filled the copy first, that is fine.
+ * Credentials come only through the `-c` settings the caller passes (the
+ * boot's credential helper), never in a URL or argument.
+ */
+export declare const SESSION_COPY_SEED_FAILURE = "session copy could not be filled from the team copy";
+interface SeedExecResult {
+    status: number;
+    stdout: string;
+    stderr: string;
+}
+type SeedExec = (cmd: string, args: string[], opts?: {
+    cwd?: string;
+}) => SeedExecResult;
+export interface SeedSessionCopyInput {
+    exec: SeedExec;
+    sessionRemote: string;
+    /** `git -c` settings that authenticate to the session copy. */
+    sessionGitConfig: string[];
+    /** Called only when the copy is empty: the team copy and its `-c` settings. */
+    resolveTeam: () => Promise<{
+        remote: string;
+        gitConfig: string[];
+    }>;
+    /** A path owned only by this seed operation; cleared before and after use. */
+    scratchDir: string;
+}
+export declare function seedSessionCopy(input: SeedSessionCopyInput): Promise<{
+    seeded: boolean;
+}>;
+export {};
+//# sourceMappingURL=hosted-session-seed.d.ts.map

package/dist/hosted-session-seed.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hosted-session-seed.d.ts","sourceRoot":"","sources":["../src/hosted-session-seed.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,eAAO,MAAM,yBAAyB,wDAAwD,CAAA;AAE9F,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AACD,KAAK,QAAQ,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,cAAc,CAAA;AAExF,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,CAAA;IACd,aAAa,EAAE,MAAM,CAAA;IACrB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,+EAA+E;IAC/E,WAAW,EAAE,MAAM,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAA;IACnE,8EAA8E;IAC9E,UAAU,EAAE,MAAM,CAAA;CACnB;AAoBD,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC,CAoB/F"}

package/dist/hosted-session-seed.js

@@ -0,0 +1,61 @@
+/**
+ * Fills an empty hosted session copy from its team copy (ORI-2118).
+ *
+ * Artifacts forks of a team copy whose history has a few file-adding commits
+ * cannot be cloned or pushed to (measured 2026-10-03, binding and REST). The
+ * broker therefore creates the session copy EMPTY, and the sandbox boot fills
+ * it here before its first clone: a bare clone of the team copy's `main`, then
+ * a push of that `main` into the session copy. A Worker cannot run git, so
+ * this is the first place in session start that can.
+ *
+ * It fills a copy only when the copy has no branches at all, which is what a
+ * freshly created copy looks like. A retried or resumed boot finds `main` and
+ * does nothing, so it never overwrites the agent's work, and a working
+ * repository whose content lives on another branch is never touched. The
+ * push is never forced; if another boot filled the copy first, that is fine.
+ * Credentials come only through the `-c` settings the caller passes (the
+ * boot's credential helper), never in a URL or argument.
+ */
+export const SESSION_COPY_SEED_FAILURE = 'session copy could not be filled from the team copy';
+function withConfig(config) {
+    return config.flatMap(setting => ['-c', setting]);
+}
+function failure(step, result) {
+    const detail = (result.stderr || result.stdout || `exit ${result.status}`).trim();
+    return new Error(`${SESSION_COPY_SEED_FAILURE}: ${step}: ${detail}`);
+}
+/** Whether the session copy has any branch. Measured on Artifacts: an empty
+ *  repository answers `ls-remote` with exit 0 and no output. Any non-zero
+ *  exit is an error, never "empty". */
+function sessionHasBranches(input) {
+    const listed = input.exec('git', [...withConfig(input.sessionGitConfig), 'ls-remote', '--heads', input.sessionRemote]);
+    if (listed.status !== 0)
+        throw failure('reading the session copy', listed);
+    return listed.stdout.trim().length > 0;
+}
+export async function seedSessionCopy(input) {
+    if (sessionHasBranches(input))
+        return { seeded: false };
+    const team = await input.resolveTeam();
+    try {
+        // A sandbox shutdown can interrupt clone before finally runs. This path
+        // belongs only to seeding; never clear the surrounding session directory.
+        const cleared = input.exec('rm', ['-rf', '--', input.scratchDir]);
+        if (cleared.status !== 0)
+            throw failure('clearing the seed scratch', cleared);
+        const fetched = input.exec('git', [...withConfig(team.gitConfig), 'clone', '--quiet', '--bare', '--single-branch', '--branch', 'main', team.remote, input.scratchDir]);
+        if (fetched.status !== 0)
+            throw failure('reading the team copy', fetched);
+        const pushed = input.exec('git', ['-C', input.scratchDir, ...withConfig(input.sessionGitConfig), 'push', '--quiet', input.sessionRemote, 'refs/heads/main:refs/heads/main']);
+        if (pushed.status !== 0) {
+            // Another boot of the same session may have filled it first.
+            if (sessionHasBranches(input))
+                return { seeded: false };
+            throw failure('pushing into the session copy', pushed);
+        }
+        return { seeded: true };
+    }
+    finally {
+        input.exec('rm', ['-rf', '--', input.scratchDir]);
+    }
+}

package/dist/hosted-skill-staging.d.ts

@@ -15,7 +15,11 @@
  *       skill-installer; the local-sim rehearsal sets it),
  *   (2) `orizu skills path`      — the packaged vendor/skills/orizu of the
  *       globally-installed CLI (the production path),
- *   (3) `$(npm root -g)/orizu/vendor/skills/orizu` — belt fallback.
+ *   (3) `/opt/orizu/cli/vendor/skills/orizu` — the canonical copy the
+ *       published-package bake installs (ORI-2375: in a prebaked sandbox the
+ *       sandbox user's npm prefix never holds the sudo-installed package),
+ *   (4) `$(npm root -g)/orizu/vendor/skills/orizu` — for the non-prebaked
+ *       bootstrap, which installs orizu globally and has no /opt/orizu/cli.
  * Then SYMLINK it under `<workspaceDir>/.claude/skills/orizu`, falling back to
  * a copy if the symlink cannot be created. Resolved paths stay in shell vars
  * (never interpolated), so they cannot inject into the command.
@@ -55,8 +59,9 @@ export interface StageOrizuSkillResult {
     stdout: string;
     stderr: string;
 }
-/** The exact staging script — exported for tests that assert its shape. */
-export declare function renderStageOrizuSkillScript(workspaceDir: string): string;
+/** The exact staging script — exported for tests that assert its shape and run it
+ *  (`canonicalSkillDir` lets a test lay the canonical copy out under a temp root). */
+export declare function renderStageOrizuSkillScript(workspaceDir: string, canonicalSkillDir?: string): string;
 /**
  * Stage the orizu skill into `<workspaceDir>/.claude/skills/orizu`.
  * Non-throwing (except via the injected exec): resolves to a structured result

package/dist/hosted-skill-staging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-skill-staging.d.ts","sourceRoot":"","sources":["../src/hosted-skill-staging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE/E,MAAM,WAAW,sBAAsB;IACrC;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,IAAI,CAAA;IAC/C,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAUD,2EAA2E;AAC3E,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAoBxE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAuBlG"}
+{"version":3,"file":"hosted-skill-staging.d.ts","sourceRoot":"","sources":["../src/hosted-skill-staging.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE/E,MAAM,WAAW,sBAAsB;IACrC;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,IAAI,CAAA;IAC/C,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAYD;sFACsF;AACtF,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,EAAE,iBAAiB,SAAsB,GAAG,MAAM,CAqBjH;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,sBAAsB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAuBlG"}

package/dist/hosted-skill-staging.js

@@ -15,7 +15,11 @@
  *       skill-installer; the local-sim rehearsal sets it),
  *   (2) `orizu skills path`      — the packaged vendor/skills/orizu of the
  *       globally-installed CLI (the production path),
- *   (3) `$(npm root -g)/orizu/vendor/skills/orizu` — belt fallback.
+ *   (3) `/opt/orizu/cli/vendor/skills/orizu` — the canonical copy the
+ *       published-package bake installs (ORI-2375: in a prebaked sandbox the
+ *       sandbox user's npm prefix never holds the sudo-installed package),
+ *   (4) `$(npm root -g)/orizu/vendor/skills/orizu` — for the non-prebaked
+ *       bootstrap, which installs orizu globally and has no /opt/orizu/cli.
  * Then SYMLINK it under `<workspaceDir>/.claude/skills/orizu`, falling back to
  * a copy if the symlink cannot be created. Resolved paths stay in shell vars
  * (never interpolated), so they cannot inject into the command.
@@ -32,8 +36,10 @@
 // non-traversal directory (both do: `<root>/repo` on the DO path, `repo` on the
 // operator path) — never an untrusted or user-supplied value.
 const SAFE_WORKSPACE_DIR = /^[A-Za-z0-9._/:@-]+$/;
-/** The exact staging script — exported for tests that assert its shape. */
-export function renderStageOrizuSkillScript(workspaceDir) {
+const CANONICAL_SKILL_DIR = '/opt/orizu/cli/vendor/skills/orizu';
+/** The exact staging script — exported for tests that assert its shape and run it
+ *  (`canonicalSkillDir` lets a test lay the canonical copy out under a temp root). */
+export function renderStageOrizuSkillScript(workspaceDir, canonicalSkillDir = CANONICAL_SKILL_DIR) {
     const skillsDir = `${workspaceDir}/.claude/skills`;
     return [
         `mkdir -p ${skillsDir}`,
@@ -48,6 +54,7 @@ export function renderStageOrizuSkillScript(workspaceDir) {
         `if [ -d ${workspaceDir}/.git ] && git -C ${workspaceDir} ls-files -- '.claude/skills/orizu' '.claude/skills/orizu/**' | grep -q .; then if [ -f "$dest/SKILL.md" ]; then echo "PRESERVED_TRACKED $dest"; else echo "PRESERVED_INVALID $dest"; fi; exit 0; fi`,
         `src="${'${ORIZU_SKILL_SOURCE_DIR:-}'}"`,
         `if [ -z "$src" ] || [ ! -d "$src" ]; then src="$(orizu skills path 2>/dev/null || true)"; fi`,
+        `if [ -z "$src" ] || [ ! -d "$src" ]; then src='${canonicalSkillDir}'; fi`,
         `if [ -z "$src" ] || [ ! -d "$src" ]; then r="$(npm root -g 2>/dev/null || true)"; if [ -n "$r" ] && [ -d "$r/orizu/vendor/skills/orizu" ]; then src="$r/orizu/vendor/skills/orizu"; fi; fi`,
         `if [ -z "$src" ] || [ ! -d "$src" ]; then echo "NO_SOURCE"; exit 0; fi`,
         `rm -rf "$dest"`,

package/dist/jsonl-stream.d.ts

@@ -1,6 +1,7 @@
 export declare const JSONL_UPLOAD_CHUNK_MAX_BYTES: number;
 interface JsonlChunkOptions {
     maxPayloadBytes?: number;
+    signal?: AbortSignal;
 }
 export declare function estimateRowsPayloadByteLength(rows: Array<Record<string, unknown>>): number;
 export declare function streamJsonlRowChunks(filePath: string, options?: JsonlChunkOptions): AsyncGenerator<Array<Record<string, unknown>>>;

package/dist/jsonl-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonl-stream.d.ts","sourceRoot":"","sources":["../src/jsonl-stream.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,QAAkB,CAAA;AAE3D,UAAU,iBAAiB;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AA2CD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAM1F;AAED,wBAAuB,oBAAoB,CACzC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,iBAAsB,GAC9B,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAqEhD"}
+{"version":3,"file":"jsonl-stream.d.ts","sourceRoot":"","sources":["../src/jsonl-stream.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B,QAAkB,CAAA;AAE3D,UAAU,iBAAiB;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AA2CD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAM1F;AAED,wBAAuB,oBAAoB,CACzC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,iBAAsB,GAC9B,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CA4EhD"}

package/dist/jsonl-stream.js

@@ -37,11 +37,17 @@ export async function* streamJsonlRowChunks(filePath, options = {}) {
     let chunkRowsByteLength = 0;
     let parsedRowCount = 0;
     let lineNumber = 0;
+    if (options.signal?.aborted)
+        throw new Error('Dataset input interrupted');
     const stream = createReadStream(filePath, { encoding: 'utf8' });
     const lines = createInterface({
         input: stream,
         crlfDelay: Infinity,
     });
+    // Closing the owned reader unblocks an outstanding next() before a scoped
+    // caller awaits return(); return alone would queue behind that pending read.
+    const interrupt = () => { lines.close(); stream.destroy(); };
+    options.signal?.addEventListener('abort', interrupt, { once: true });
     try {
         for await (const line of lines) {
             lineNumber += 1;
@@ -79,6 +85,7 @@ export async function* streamJsonlRowChunks(filePath, options = {}) {
         throw mapReadError(filePath, error);
     }
     finally {
+        options.signal?.removeEventListener('abort', interrupt);
         lines.close();
         stream.destroy();
     }

package/dist/provider-list-workflow.d.ts

@@ -0,0 +1,3 @@
+import type { ModelConfigsCommandIo } from './model-configs-cli.js';
+export declare function listProviders(projectArg: string | null, io: ModelConfigsCommandIo): Promise<number>;
+//# sourceMappingURL=provider-list-workflow.d.ts.map

package/dist/provider-list-workflow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-list-workflow.d.ts","sourceRoot":"","sources":["../src/provider-list-workflow.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAoDnE,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiDzG"}

package/dist/provider-list-workflow.js

@@ -0,0 +1,95 @@
+import { Context, Effect, Result, Schema } from 'effect';
+import { authedFetch } from './http.js';
+import { providerWireRecord as record } from './provider-wire-record.js';
+import { isProviderRefusalCode } from './provider-refusals.js';
+function providerListFailureMessage(failure) {
+    switch (failure._tag) {
+        case 'Http': return failure.message;
+        case 'Transport': return 'Provider request failed';
+        // Project selection remains the existing, separately owned adapter.
+        case 'Resolution':
+        case 'Adapter': return failure.message;
+        default: {
+            const exhaustive = failure;
+            return exhaustive;
+        }
+    }
+}
+const ProviderListTransport = Context.Service('orizu/cli/ProviderListTransport');
+const WireRecord = Schema.Record(Schema.String, Schema.Unknown);
+const emptyWireRecord = {};
+function providerListProgram(project, io) {
+    return Effect.gen(function* () {
+        const transport = yield* ProviderListTransport;
+        const response = yield* transport.read(project);
+        // Decode raw wire data; malformed JSON and non-record bodies retain the
+        // existing empty record fallback without narrowing accepted record fields.
+        const value = yield* Effect.promise(() => response.json().catch(() => null));
+        const body = yield* Schema.decodeUnknownEffect(WireRecord)(value).pipe(Effect.catch(() => Effect.succeed(emptyWireRecord)));
+        if (!response.ok) {
+            const message = typeof body.error === 'string' && isProviderRefusalCode(body.error) ? body.error : 'Provider request failed';
+            return yield* Effect.fail({ _tag: 'Http', message });
+        }
+        yield* Effect.sync(() => {
+            if (io.json)
+                io.print(JSON.stringify(body));
+            else {
+                io.print('ID  PROTOCOL  HOST  CREDENTIAL ENV  BUILT-IN');
+                for (const value of Array.isArray(body.providers) ? body.providers : []) {
+                    const row = record(value);
+                    io.print(`${row.id}  ${row.protocol}  ${row.host}  ${row.credentialEnv}  ${row.builtIn ? 'yes' : 'no'}`);
+                }
+            }
+        });
+    });
+}
+export async function listProviders(projectArg, io) {
+    const controller = new AbortController();
+    let interrupted;
+    const interrupt = () => { interrupted = 130; controller.abort(); };
+    const terminate = () => { interrupted = 143; controller.abort(); };
+    const transport = {
+        read: (project) => Effect.tryPromise({
+            try: signal => (io.fetcher ?? authedFetch)(`/api/cli/providers?project=${encodeURIComponent(project)}`, {
+                method: 'GET', signal: AbortSignal.any([signal, controller.signal]),
+            }),
+            // The retained HTTP adapter exposes login/config/refresh diagnostics as
+            // untyped Error values. Preserve its public messages until ORI-2420
+            // supplies typed adapter failures; never expose nested transport causes.
+            catch: (cause) => cause instanceof Error
+                ? { _tag: 'Adapter', message: cause.message }
+                : { _tag: 'Transport' },
+        }),
+    };
+    const program = Effect.gen(function* () {
+        const project = yield* Effect.tryPromise({
+            try: async () => {
+                const project = await io.resolveProjectSlug?.(projectArg);
+                if (!project)
+                    throw new Error('Project resolver unavailable');
+                return project;
+            },
+            catch: (cause) => ({ _tag: 'Resolution', message: cause instanceof Error ? cause.message : 'Provider request failed' }),
+        });
+        // The retained resolver is unsignalled. Do not suppress Node's natural
+        // termination until the cancellable catalog transport has been admitted.
+        return yield* Effect.acquireUseRelease(Effect.sync(() => { process.once('SIGINT', interrupt); process.once('SIGTERM', terminate); }), () => providerListProgram(project, io).pipe(Effect.provideService(ProviderListTransport, transport)), () => Effect.sync(() => {
+            process.removeListener('SIGINT', interrupt);
+            process.removeListener('SIGTERM', terminate);
+        }));
+    });
+    try {
+        const result = await Effect.runPromise(Effect.result(program), { signal: controller.signal });
+        if (Result.isSuccess(result))
+            return 0;
+        const message = providerListFailureMessage(result.failure);
+        io.print(io.json ? JSON.stringify({ error: message }) : message);
+        return 1;
+    }
+    catch {
+        if (interrupted !== undefined)
+            return interrupted;
+        io.print(io.json ? JSON.stringify({ error: 'Provider request failed' }) : 'Provider request failed');
+        return 1;
+    }
+}

package/dist/provider-wire-record.d.ts

@@ -0,0 +1,3 @@
+/** Preserve the provider commands' permissive ordinary-TypeScript row coercion. */
+export declare function providerWireRecord(value: unknown): Record<string, unknown>;
+//# sourceMappingURL=provider-wire-record.d.ts.map

package/dist/provider-wire-record.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-wire-record.d.ts","sourceRoot":"","sources":["../src/provider-wire-record.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE1E"}

package/dist/provider-wire-record.js

@@ -0,0 +1,4 @@
+/** Preserve the provider commands' permissive ordinary-TypeScript row coercion. */
+export function providerWireRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value) ? Object.fromEntries(Object.entries(value)) : {};
+}

package/dist/providers-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providers-cli.d.ts","sourceRoot":"","sources":["../src/providers-cli.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAyEnE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyEzH"}
+{"version":3,"file":"providers-cli.d.ts","sourceRoot":"","sources":["../src/providers-cli.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAsEnE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAmEzH"}

package/dist/providers-cli.js

@@ -1,12 +1,10 @@
 import { authedFetch } from './http.js';
+import { providerWireRecord as object } from './provider-wire-record.js';
 import { credentialEnvFor, providerLookupFor } from './provider-lookup.js';
 import { CREDENTIAL_ENV_PATTERN, PROVIDER_FIELD_PATTERNS, RESERVED_CREDENTIAL_ENVS, isProviderRefusalCode } from './provider-refusals.js';
 import { findProvider, parseModelIdentity } from './provider-registry.js';
 import { PROBE_PROTOCOLS, probeProvider, probeTarget } from './provider-probe.js';
 const FIELD_CONTRACT = 'Anthropic Messages base URL excludes /v1; OpenAI base URLs include the version segment.';
-function object(value) {
-    return typeof value === 'object' && value !== null && !Array.isArray(value) ? Object.fromEntries(Object.entries(value)) : {};
-}
 function assertProtocol(value) {
     if (typeof value !== 'string' || !Object.hasOwn(PROBE_PROTOCOLS, value))
         throw new Error('provider_protocol_invalid');
@@ -99,6 +97,10 @@ export async function providersCommand(args, io, checkIdentity) {
             baseUrl = baseUrl.replace(/^(https:\/\/)([^/]+)/, (_, scheme, host) => scheme + host.toLowerCase());
             provider = providerRow({ id, baseUrl, protocol: flags.get('--protocol') ?? 'openai-chat', credentialEnv: flags.get('--credential-env') ?? credentialEnvFor(id), authHeader: flags.get('--auth-header') ?? 'Authorization', authValuePrefix: flags.get('--auth-value-prefix') ?? 'Bearer ' });
         }
+        if (checkIdentity === undefined && command === 'list' && positional.length === 1) {
+            const { listProviders } = await import('./provider-list-workflow.js');
+            return listProviders(flags.get('--project') || null, io);
+        }
         const project = await io.resolveProjectSlug?.(flags.get('--project') || null);
         if (!project)
             throw new Error('Project resolver unavailable');
@@ -131,18 +133,6 @@ export async function providersCommand(args, io, checkIdentity) {
                 throw new Error('provider_not_found');
             await runProbe(entry, identity.modelId, io);
         }
-        else if (command === 'list' && positional.length === 1) {
-            const body = await request(root, { method: 'GET' });
-            if (io.json)
-                io.print(JSON.stringify(body));
-            else {
-                io.print('ID  PROTOCOL  HOST  CREDENTIAL ENV  BUILT-IN');
-                for (const value of Array.isArray(body.providers) ? body.providers : []) {
-                    const row = object(value);
-                    io.print(`${row.id}  ${row.protocol}  ${row.host}  ${row.credentialEnv}  ${row.builtIn ? 'yes' : 'no'}`);
-                }
-            }
-        }
         else if (command === 'remove' && id && positional.length === 2) {
             await request(`/api/cli/providers/${encodeURIComponent(id)}?project=${encodeURIComponent(project)}`, { method: 'DELETE' });
             io.print(io.json ? JSON.stringify({ removed: id }) : `Removed provider ${id}`);

package/dist/publish-merge-job.d.ts

@@ -0,0 +1,68 @@
+import { type PublishMergeJobFailureCode } from './publish-merge-timing.js';
+/** ADR-012's envelope for a repository's whole object graph. The graph is
+ * always larger than the content it was seeded from, so ADR-011's 1 GiB
+ * content limit is not the measure here. */
+declare const ADMISSION: {
+    totalBytes: number;
+    objectBytes: number;
+    objects: number;
+    commits: number;
+};
+interface PublishMergeJobEnv {
+    bootSecret: string;
+    jobId: string;
+    coordinatorUrl: string;
+    baseUrl: string;
+    /** The Artifacts git host the coordinator expects; localhost only in tests. */
+    expectedGitHost: string;
+    /** The coordinator's wall, epoch ms; see the timing note above. */
+    wallAt?: number;
+}
+export type PublishMergeJobOutcome = {
+    outcome: 'merged';
+    mergeSha: string;
+} | {
+    outcome: 'already_merged';
+    headSha: string;
+}
+/** At most PUBLISH_MERGE_CONFLICT_FILES_LIMIT paths; `moreFiles` counts the rest. */
+ | {
+    outcome: 'conflict';
+    files: readonly string[];
+    moreFiles: number;
+} | {
+    outcome: 'denied';
+} | {
+    outcome: 'race_lost';
+} | {
+    outcome: 'failed';
+    code: PublishMergeJobFailureCode;
+};
+/** One `<type> <size>` line per object, as `git cat-file --batch-check` prints them. */
+export declare function isMergeInventoryAdmitted(inventory: string, narrower?: Partial<typeof ADMISSION>): boolean;
+/** The conflict list the job reports, bounded so the result always fits the
+ * coordinator's body limit. A path too long to name is counted instead. */
+export declare function boundConflictFiles(files: readonly string[]): {
+    files: string[];
+    moreFiles: number;
+};
+export declare function runPublishMergeJob(options: {
+    env: PublishMergeJobEnv;
+    deadlineMs?: number;
+    /** Narrower admission limits; tests only. Never wider than ADMISSION. */
+    admission?: Partial<typeof ADMISSION>;
+    /** Shorter timing; tests only. Each is clamped to its production value. */
+    timing?: {
+        resultReserveMs?: number;
+        lateCallMs?: number;
+    };
+}): Promise<{
+    reported: boolean;
+    outcome: PublishMergeJobOutcome;
+}>;
+export declare function publishMergeJobCommand(args: readonly string[], io: {
+    print: (line: string) => void;
+    printErr?: (line: string) => void;
+}): Promise<number>;
+export {};
+//# sourceMappingURL=publish-merge-job.d.ts.map