orizu 0.5.8 → 0.5.9

package/dist/hosted-bootstrap.js

@@ -280,6 +280,12 @@ export async function bootstrapHostedSandbox(opts) {
         const skillSkillsDirRel = `${workspaceDir}/.claude/skills`;
         const stage = await session.exec([
             `mkdir -p ${skillSkillsDirRel}`,
+            // The staged skill is bootstrap-injected RUNTIME scaffolding (a symlink to
+            // the sandbox-local CLI vendor dir), NOT the agent's work. Exclude it
+            // repo-LOCALLY (.git/info/exclude — invisible to the diff, never committed)
+            // so auto-harvest's `git add -A` can't sweep it into the session branch and
+            // (ALI-1051) auto-apply a broken symlink to the customer's main.
+            `if [ -d ${workspaceDir}/.git ]; then printf '%s\\n' '/.claude/skills/' >> ${workspaceDir}/.git/info/exclude; 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 r="$(npm root -g 2>/dev/null || true)"; if [ -n "$r" ] && [ -d "$r/orizu/vendor/skills/orizu-cli" ]; then src="$r/orizu/vendor/skills/orizu-cli"; fi; fi`,

package/dist/hosted-harvest.js

@@ -66,13 +66,18 @@ export function harvestWorkspace(opts) {
     }
     const exec = opts.exec ?? defaultHarvestExec(opts.workspaceDir);
     try {
-        const status = exec(['status', '--porcelain']);
+        // Never harvest bootstrap-injected runtime scaffolding (ALI-1051): the
+        // .claude/skills symlink is a sandbox-local pointer, not the agent's work.
+        // Bootstrap also excludes it via .git/info/exclude; this pathspec is the
+        // belt-and-braces for any sandbox where that didn't run.
+        const excludeScaffold = [':(exclude).claude/skills/**', ':(exclude).claude/skills'];
+        const status = exec(['status', '--porcelain', '--', '.', ...excludeScaffold]);
         if (status.exitCode !== 0) {
             return { kind: 'work_persist_failed', error: `git status failed: ${detail(status)}` };
         }
         const dirty = status.stdout.trim().length > 0;
         if (dirty) {
-            const add = exec(['add', '-A']);
+            const add = exec(['add', '-A', '--', '.', ...excludeScaffold]);
             if (add.exitCode !== 0) {
                 return { kind: 'work_persist_failed', error: `git add failed: ${detail(add)}` };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orizu",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "private": false,
   "type": "module",
   "bin": {

package/src/hosted-bootstrap.ts

@@ -457,6 +457,12 @@ export async function bootstrapHostedSandbox(opts: HostedBootstrapOptions): Prom
     const stage = await session.exec(
       [
         `mkdir -p ${skillSkillsDirRel}`,
+        // The staged skill is bootstrap-injected RUNTIME scaffolding (a symlink to
+        // the sandbox-local CLI vendor dir), NOT the agent's work. Exclude it
+        // repo-LOCALLY (.git/info/exclude — invisible to the diff, never committed)
+        // so auto-harvest's `git add -A` can't sweep it into the session branch and
+        // (ALI-1051) auto-apply a broken symlink to the customer's main.
+        `if [ -d ${workspaceDir}/.git ]; then printf '%s\\n' '/.claude/skills/' >> ${workspaceDir}/.git/info/exclude; 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 r="$(npm root -g 2>/dev/null || true)"; if [ -n "$r" ] && [ -d "$r/orizu/vendor/skills/orizu-cli" ]; then src="$r/orizu/vendor/skills/orizu-cli"; fi; fi`,

package/src/hosted-harvest.ts

@@ -104,14 +104,19 @@ export function harvestWorkspace(opts: HarvestOptions): HarvestOutcome {
   }
   const exec = opts.exec ?? defaultHarvestExec(opts.workspaceDir)
   try {
-    const status = exec(['status', '--porcelain'])
+    // Never harvest bootstrap-injected runtime scaffolding (ALI-1051): the
+    // .claude/skills symlink is a sandbox-local pointer, not the agent's work.
+    // Bootstrap also excludes it via .git/info/exclude; this pathspec is the
+    // belt-and-braces for any sandbox where that didn't run.
+    const excludeScaffold = [':(exclude).claude/skills/**', ':(exclude).claude/skills']
+    const status = exec(['status', '--porcelain', '--', '.', ...excludeScaffold])
     if (status.exitCode !== 0) {
       return { kind: 'work_persist_failed', error: `git status failed: ${detail(status)}` }
     }
     const dirty = status.stdout.trim().length > 0
 
     if (dirty) {
-      const add = exec(['add', '-A'])
+      const add = exec(['add', '-A', '--', '.', ...excludeScaffold])
       if (add.exitCode !== 0) {
         return { kind: 'work_persist_failed', error: `git add failed: ${detail(add)}` }
       }