atris 3.57.4 → 3.58.6

package/commands/pack.js

@@ -25,6 +25,9 @@ const {
   finalizePackRunReceipt,
   receiptDirectory,
   classifyPackRunLifecycle,
+  assessPackRecoveryJournal,
+  claimPackRecoveryParent,
+  confirmPackRecoveryClaim,
 } = require('../lib/pack-capabilities');
 
 const REGISTRY_TIMEOUT_MS = 60000;
@@ -101,7 +104,7 @@ const PACKET = {
 
   // ── definitions, not state ────────────────────────────────────────────────
   // A packet carries what a thing IS, never what it is currently DOING. The
-  // definition files travel — MEMBER.md, MISSION.md, SKILL.md, SOUL.md,
+  // definition files travel: MEMBER.md, MISSION.md, SKILL.md, SOUL.md,
   // README.md, wiki pages, policies. The running state a live workspace keeps
   // beside them stays home: a stranger cannot use someone else's standup notes,
   // and project-management exhaust is most of the file count.
@@ -160,7 +163,7 @@ function showHelp() {
   console.log('       atris pack seal <dir> [--type <t>] [--entrypoint <file>]');
   console.log('       atris pack publish [--dir atris] [--slug <slug>] [--author "<name>"] [--notes "..."] [--visibility public|unlisted|private] [--minor|--major] [--out <file.zip>] [--push] [--dry-run] [--allow-secrets]');
   console.log('       atris pack install <file.zip|url|slug> [--dir <target>] [--force]');
-  console.log('       atris pack run <slug|dir> [--dir <target>] [--input <file>] [--cloud] [--force] [--trust] [--grant <capability>]');
+  console.log('       atris pack run <slug|dir> [--dir <target>] [--input <file>] [--cloud] [--force] [--trust] [--grant <capability>] [--recover <receipt.json>]');
   console.log('       atris pack runs [--dir <receipt-dir>] [--limit <n>] [--json]');
   console.log('       atris pack share <slug> --for "<Name>" [--days 30]');
   console.log('       atris pack share <slug> --list');
@@ -1508,7 +1511,7 @@ function formatBytes(value) {
 }
 
 // What a stranger actually receives, in one glance. The tree below is the
-// detail; this is the shape — enough to see that the wiki, the skills, the
+// detail; this is the shape, enough to see that the wiki, the skills, the
 // members and the policies are all still in the box.
 function printPacketComposition(entries) {
   const byTop = new Map();
@@ -2254,7 +2257,7 @@ async function installPack(rawArgs, cwd = process.cwd(), options = {}) {
 
 // ── pack run ────────────────────────────────────────────────────────────────
 // Install is half a product: it leaves a folder and a suggestion. `pack run`
-// is the other half — packet in, running workspace out.
+// is the other half: packet in, running workspace out.
 //
 // It defaults to LOCAL on purpose. The cloud path is gated: activating a
 // business workspace needs auth, an existing business record, and a paid plan
@@ -2450,7 +2453,7 @@ function printCapabilityTrustCard(policy, trust, receiptPath, userDenyRuleCount
   if (options.operatorInput) {
     console.log(`  operator input: ${options.operatorInput.bytes} bytes injected; source path withheld from the pack and receipt`);
   }
-  console.log(`  host shell: ${policy.grantedCapabilities.includes('host.shell') ? 'GRANTED — Bash can reach host files and network' : 'denied'}`);
+  console.log(`  host shell: ${policy.grantedCapabilities.includes('host.shell') ? 'GRANTED \u2014 Bash can reach host files and network' : 'denied'}`);
   console.log('  receipt coverage: Atris hook tool events; direct slash-skill invocations and later Claude or policy denials may not appear');
   console.log(`  receipt: ${receiptPath}`);
 }
@@ -2530,7 +2533,13 @@ function startPackLocal(packDir, deps = {}, options = {}) {
       ? process.stdin.isTTY !== true
       : deps.nonInteractive === true);
   const start = deps.computerLocal || require('./computer').computerLocal;
-  const wrappedOpeningPrompt = packOpeningInstruction(openingPrompt, operatorInput);
+  const recovery = options.recovery || null;
+  let wrappedOpeningPrompt = packOpeningInstruction(openingPrompt, operatorInput);
+  if (recovery && Array.isArray(recovery.protectedFiles) && recovery.protectedFiles.length) {
+    const names = recovery.protectedFiles.map((entry) => entry.target).join(', ');
+    const note = `This is a recovered run. These completed files are protected and must not be rewritten: ${names}. Continue with other files.`;
+    wrappedOpeningPrompt = wrappedOpeningPrompt ? `${wrappedOpeningPrompt}\n\n${note}` : note;
+  }
   const runnerArgs = [];
   let pluginDir = null;
   let receipt = null;
@@ -2556,6 +2565,7 @@ function startPackLocal(packDir, deps = {}, options = {}) {
       packSkillsPluginLoaded: Boolean(pluginDir),
       nonInteractive,
       operatorInput: operatorInput ? { bytes: operatorInput.bytes, sha256: operatorInput.sha256 } : null,
+      recovery,
     });
     runnerArgs.push(...buildClaudeCapabilityArgs(capabilityPolicy, { trust, userDenyRules, nonInteractive }));
     runnerOptions.runnerEnv = {
@@ -2563,11 +2573,13 @@ function startPackLocal(packDir, deps = {}, options = {}) {
       ATRIS_PACK_RECEIPT: receipt.receiptPath,
       ATRIS_PACK_RECEIPT_EVENTS: receipt.eventsPath,
       ATRIS_PACK_GRANTED_CAPABILITIES: JSON.stringify(capabilityPolicy.grantedCapabilities),
+      ATRIS_PACK_PROTECTED_FILES: JSON.stringify(recovery && recovery.protectedFiles ? recovery.protectedFiles : []),
       CLAUDE_CODE_DISABLE_CLAUDE_MDS: '1',
       CLAUDE_CODE_DISABLE_AUTO_MEMORY: '1',
       CLAUDE_CODE_SKIP_PROMPT_HISTORY: '1',
       CLAUDE_CODE_SUBPROCESS_ENV_SCRUB: '1',
     };
+    if (typeof options.onReceipt === 'function') options.onReceipt(receipt);
     runnerOptions.cleanupPaths = pluginDir ? [pluginDir] : [];
     runnerOptions.onRunnerExit = ({ status, signal }) => {
       appendReceiptEvent(receipt.eventsPath, {
@@ -2579,6 +2591,10 @@ function startPackLocal(packDir, deps = {}, options = {}) {
       nonInteractive,
       operatorInput,
     });
+    if (recovery) {
+      const names = (recovery.protectedFiles || []).map((entry) => entry.target).join(', ');
+      console.log(`recovery: continuing from ${recovery.parentRunId} with ${(recovery.protectedFiles || []).length} protected file(s): ${names}.`);
+    }
   } else {
     const skillsDir = path.join(packDir, 'skills');
     const hasShippedSkill = fs.existsSync(skillsDir)
@@ -2693,6 +2709,10 @@ async function runPack(rawArgs, cwd = process.cwd(), options = {}) {
   const force = takeFlag(args, '--force');
   const trust = takeFlag(args, '--trust');
   const grants = takeValues(args, '--grant');
+  const recoverArg = takeValue(args, '--recover');
+  if (recoverArg !== null && (!recoverArg || !String(recoverArg).trim())) {
+    throw new Error('pack run --recover needs a receipt path; explicit empty values never fall through to a fresh run');
+  }
   if (args.length) throw new Error(`unknown pack run argument: ${args.join(' ')}`);
 
   const operatorInput = inputArg ? readPackRunInput(inputArg, cwd) : null;
@@ -2710,6 +2730,7 @@ async function runPack(rawArgs, cwd = process.cwd(), options = {}) {
     packDir = path.resolve(cwd, source);
     manifest = assertPacketDir(packDir, cwd);
   } else {
+    if (recoverArg !== null) throw new Error('pack run --recover needs an existing pack directory, not a slug to install');
     packDir = path.resolve(cwd, targetArg || slugify(source));
     const alreadyThere = !force && fs.existsSync(path.join(packDir, 'pack.json'));
     if (alreadyThere) {
@@ -2735,6 +2756,36 @@ async function runPack(rawArgs, cwd = process.cwd(), options = {}) {
     );
   }
   if (capabilityPolicy.status === 'enforced') assertPackExecutionTree(packDir);
+  let recovery = null;
+  let claimPath = null;
+  let childReceiptPath = null;
+  if (recoverArg !== null) {
+    if (cloud) throw new Error('pack run --recover is local-only; cloud recovery is not supported');
+    if (capabilityPolicy.status !== 'enforced') {
+      throw new Error('pack run --recover needs a declared capability ceiling; legacy packs cannot be recovered');
+    }
+    if (capabilityPolicy.grantedCapabilities.includes('host.shell')) {
+      throw new Error('pack run --recover cannot grant host.shell; shell effects cannot be reasoned about');
+    }
+    const parentReceiptPath = path.resolve(cwd, recoverArg);
+    const childReceiptDir = receiptDirectory({ receiptDir: deps.packRunReceiptDir });
+    const assessment = assessPackRecoveryJournal({
+      packDir,
+      manifest,
+      policy: capabilityPolicy,
+      parentReceiptPath,
+      operatorInput,
+      childReceiptDir,
+    });
+    // Claimed before launch so a parent backs at most one child. A crash
+    // from here on leaves a pending claim that needs manual review.
+    claimPath = claimPackRecoveryParent(parentReceiptPath, assessment.parentRunId);
+    recovery = {
+      parentRunId: assessment.parentRunId,
+      parentReceipt: parentReceiptPath,
+      protectedFiles: assessment.protectedFiles,
+    };
+  }
   if (cloud) return startPackCloud(packDir, displayTarget, deps, { capabilityPolicy });
   if (trust && capabilityPolicy.status === 'legacy') {
     throw new Error(
@@ -2749,19 +2800,34 @@ async function runPack(rawArgs, cwd = process.cwd(), options = {}) {
   }
   console.log(`starting local computer in ${displayTarget}`);
   if (capabilityPolicy.status === 'legacy') {
-    console.log('capabilities: LEGACY — this pack declares no enforceable capability ceiling.');
+    console.log('capabilities: LEGACY, this pack declares no enforceable capability ceiling.');
   }
   if (!trust && capabilityPolicy.status === 'legacy') {
     console.log('permission prompts are on because this legacy pack has no capability ceiling.');
     console.log('for a bounded read-only run, add --grant pack.read; add --trust only to pre-approve that ceiling.');
   }
-  return startPackLocal(packDir, deps, {
+  const code = startPackLocal(packDir, deps, {
     trust,
     openingPrompt,
     operatorInput,
     capabilityPolicy,
     manifest,
+    recovery,
+    onReceipt: (receipt) => {
+      childReceiptPath = receipt.receiptPath;
+      if (claimPath) confirmPackRecoveryClaim(claimPath, receipt.receiptPath);
+    },
   });
+  if (claimPath && childReceiptPath) {
+    try {
+      confirmPackRecoveryClaim(claimPath, childReceiptPath);
+    } catch {
+      // Already confirmed in onReceipt before the runner ran; the real
+      // console exits the process there, so this is only a backstop for
+      // injected runners that return normally.
+    }
+  }
+  return code;
 }
 
 async function updatePack(rawArgs, cwd = process.cwd(), options = {}) {

package/commands/plugin.js

@@ -44,7 +44,7 @@ function generateManifest(skills, projectDir) {
   return {
     name: 'atris-workspace',
     version: pkg.version || '1.0.0',
-    description: `Atris workspace skills for Cowork — ${skills.length} integrations (email, calendar, slack, drive, notion, and more)`,
+    description: `Atris workspace skills for Cowork: ${skills.length} integrations (email, calendar, slack, drive, notion, and more)`,
     author: {
       name: typeof pkg.author === 'string' ? pkg.author : (pkg.author?.name || 'Atris')
     },
@@ -89,7 +89,7 @@ If not logged in, run:
 atris login
 \`\`\`
 
-This is interactive — the user will need to complete OAuth in their browser and paste the CLI code. Guide them through it.
+This is interactive, the user will need to complete OAuth in their browser and paste the CLI code. Guide them through it.
 
 ## Step 3: Check integration status
 
@@ -149,7 +149,7 @@ Brings Atris CLI skills into the Cowork desktop app.
 
 1. Install this plugin in Cowork
 2. Run \`/atris-setup\` to authenticate and connect integrations
-3. Start using skills — they trigger automatically based on your requests
+3. Start using skills: they trigger automatically based on your requests
 
 ## Included Skills (${skills.length})
 
@@ -279,7 +279,7 @@ function buildPlugin(...args) {
     console.log('');
 
   } finally {
-    // Clean up temp dir (only if ZIP succeeded — we skip cleanup on error above)
+    // Clean up temp dir (only if ZIP succeeded, we skip cleanup on error above)
     if (fs.existsSync(tempDir)) {
       try { fs.rmSync(tempDir, { recursive: true, force: true }); } catch (e) { /* ignore */ }
     }
@@ -346,7 +346,7 @@ function publishPlugin(...args) {
     process.exit(1);
   }
 
-  // Find the marketplace repo — check sibling dir or --repo flag
+  // Find the marketplace repo: check sibling dir or --repo flag
   let marketplaceDir = null;
   for (const arg of args) {
     if (typeof arg === 'string' && arg.startsWith('--repo=')) {
@@ -432,7 +432,7 @@ function publishPlugin(...args) {
     execSync('git add -A', { cwd: marketplaceDir, stdio: 'pipe' });
     const status = execSync('git status --porcelain', { cwd: marketplaceDir, encoding: 'utf8' }).trim();
     if (!status) {
-      console.log('✓ No changes — marketplace already up to date.');
+      console.log('✓ No changes, marketplace already up to date.');
       return;
     }
     execSync(`git commit -m "chore: Update atris-workspace plugin to v${version}"`, {

package/commands/probe.js

@@ -1,6 +1,6 @@
-// atris probe — chat-lane probe (TRR-22): one REAL /atris2/turn over the full
+// atris probe: chat-lane probe (TRR-22): one REAL /atris2/turn over the full
 // tool relay, exactly as the surfaces run it. Port of terrace's
-// atris/bin/relay-probe and atris/bin/calendar-probe — keep the op tables in
+// atris/bin/relay-probe and atris/bin/calendar-probe, so keep the op tables in
 // lockstep across iOS (votd/GMModeAPI.swift Atris2ToolRelay), web
 // (atrisos-web orbToolRelay.ts), Obelisk (atris2LocalFileOp.cjs), and the
 // terrace probes.
@@ -14,7 +14,7 @@
 //
 // PASS = >=1 relayed op (with --calendar: >=1 calendar cli op) AND a non-empty
 // final answer with no dead-end marker; otherwise prints the marker in the
-// receipt line and exits 1 — a FAIL naming the dead-end is the instrument
+// receipt line and exits 1. a FAIL naming the dead-end is the instrument
 // working. The receipt line is journal-ready.
 //
 // Usage:
@@ -32,7 +32,7 @@ const { loadCredentials } = require('../utils/auth');
 const { buildToolResultBody } = require('../lib/tool-result-encode');
 
 // G2's honest blocked message (tool_policy_bench.MAX_TURNS_EXHAUSTED_MESSAGE)
-// starts with this — an answer that is only this marker is a dead-end.
+// starts with this. an answer that is only this marker is a dead-end.
 const MAX_TURNS_MARKER = 'i ran out of tool budget for this turn';
 
 function workspaceLabel(businessId) {
@@ -61,7 +61,7 @@ function normalizeBash(cmd, label) {
 
 // No write/edit file ops, and the `..` guard only covers args.path. The
 // `bash` op still executes whatever command the model sends, verbatim, on
-// the remote ai-computer — that is the production relay contract and the
+// the remote ai-computer, that is the production relay contract and the
 // table must stay in lockstep with it, so this probe is NOT read-only.
 function fileOpCommand(args, label) {
   const op = String(args.type || '').toLowerCase();
@@ -78,7 +78,7 @@ function fileOpCommand(args, label) {
   return null;
 }
 
-// Port of Atris2ToolRelay.atrisCLICommand (GMModeAPI.swift) — op → `atris …`.
+// Port of Atris2ToolRelay.atrisCLICommand (GMModeAPI.swift): op → `atris …`.
 const SIMPLE_CLI_OPS = {
   status: ['atris.md'],
   integrations_status: ['integrations'],
@@ -122,7 +122,7 @@ function atrisCliCommand(args) {
 
 function atrisCliResult(command, term) {
   // a terminal response without a numeric exit_code is a broken endpoint,
-  // not a success — never let it masquerade as ok with empty stdout
+  // not a success. never let it masquerade as ok with empty stdout
   const code = typeof term.exit_code === 'number' ? term.exit_code : -1;
   const out = {
     schema: 'atris.local_cli_result.v1',
@@ -227,7 +227,7 @@ function parseArgs(argv) {
 
 // Core /atris2/turn client: one streamed turn over the full local tool relay.
 // Shared by `atris probe` (the instrument) and `atris mission run --runner atris2`
-// (the worker). Transport-level outcome only — callers apply their own
+// (the worker). Transport-level outcome only. callers apply their own
 // pass/fail policy on top of the returned fields.
 async function runAtris2Turn(opts = {}) {
   const {
@@ -454,7 +454,7 @@ async function probeCommand(argv) {
   const detail = ok
     ? `answer: ${resultText.slice(0, 80).replace(/\n/g, ' ')}`
     : `dead-end: ${deadEnd}`;
-  const line = `- **atris-probe** \`${stamp}\` — ${where} · ${a.model}`
+  const line = `- **atris-probe** \`${stamp}\` \u2014 ${where} · ${a.model}`
     + (member ? ` · member=${member}` : '')
     + (engine ? ` · engine=${engine}` : '')
     + ` · ${ok ? 'PASS' : 'FAIL'} · ${secs}s · tools=${toolsRun}`

package/commands/pull.js

@@ -259,14 +259,14 @@ async function pullBusiness(slug) {
   // Determine output directory.
   //
   // We only reuse the current working directory when we can prove it's the
-  // correct workspace for THIS business — i.e. it has a `.atris/business.json`
+  // correct workspace for THIS business, i.e. it has a `.atris/business.json`
   // whose slug matches `slug`. Any other signal (a stray `atris/` folder, a
   // business.json for a different business, etc.) is NOT enough: pulling
   // one business on top of another business workspace would mix two businesses into
   // one directory and write one manifest over the other (or vice
   // versa), causing the next sync to do strange things.
   //
-  // Fallback: create a fresh ./{slug}/ subdir. Always safe — even if cwd is
+  // Fallback: create a fresh ./{slug}/ subdir. Always safe, even if cwd is
   // $HOME or /tmp, we land in a dedicated subfolder.
   const intoIdx = process.argv.indexOf('--into');
   let outputDir;
@@ -281,7 +281,7 @@ async function pullBusiness(slug) {
         const cwdSlug = biz.slug || biz.name;
         cwdMatchesSlug = cwdSlug === slug;
       } catch {
-        // Corrupt business.json — ignore, treat as no match.
+        // Corrupt business.json, ignore, treat as no match.
       }
     }
     outputDir = cwdMatchesSlug ? process.cwd() : path.join(process.cwd(), slug);
@@ -289,7 +289,7 @@ async function pullBusiness(slug) {
 
   // Auto-relocate if the resolved outputDir is dangerous ($HOME, /, /Users,
   // system dirs, reserved home folders). Non-technical users shouldn't have
-  // to know about mkdir/cd — atris picks a safe subdir and tells them.
+  // to know about mkdir/cd, atris picks a safe subdir and tells them.
   // Paired with the manifest-scoped sweep below, this makes it impossible
   // for a stray cwd to cause atris to delete user files.
   ({ dir: outputDir } = resolveSafeOutputDir(outputDir, { slug, op: 'pull into' }));
@@ -298,7 +298,7 @@ async function pullBusiness(slug) {
   // narrowed bound workspace pulls to atris/, which made staging snapshots and
   // the real workspace diverge while both reported "synced".
 
-  // Resolve business ID — always refresh from API to avoid stale workspace_id
+  // Resolve business ID, always refresh from API to avoid stale workspace_id
   let businessId, workspaceId, businessName, resolvedSlug;
   let localSlug = slug;
   const businesses = loadBusinesses();
@@ -347,14 +347,14 @@ async function pullBusiness(slug) {
     process.exit(1);
   }
 
-  // Telemetry helper — captures wall-clock time including wake.
+  // Telemetry helper, captures wall-clock time including wake.
   let _coldWake = false;
   const emit = (outcome, extras = {}) =>
     emitSyncEvent(creds.token, businessId, workspaceId, 'pull', outcome, elapsedMs(), extras);
 
   // Auto-wake the EC2 computer if --auto-wake is set.
   // Without this, pull silently serves stale data from agent_files cache when
-  // the computer is asleep — the bug that confused us all night.
+  // the computer is asleep, the bug that confused us all night.
   const autoWake = process.argv.includes('--auto-wake');
   if (autoWake) {
     const statusResult = await apiRequestJson(`/business/${businessId}/ai-computer/status`, { method: 'GET', token: creds.token });
@@ -415,7 +415,7 @@ async function pullBusiness(slug) {
   const pathsParam = onlyPrefixes ? `&paths=${encodeURIComponent(onlyPrefixes.map(p => p.replace(/\/$/, '')).join(','))}` : '';
 
   if (hasManifest) {
-    // Phase 1: fetch hashes only (fast — no file content transferred)
+    // Phase 1: fetch hashes only (fast, no file content transferred)
     const hashUrl = `/business/${businessId}/workspaces/${workspaceId}/snapshot?include_content=false${pathsParam}`;
     const hashResult = await apiRequestJson(hashUrl, { method: 'GET', token: creds.token, timeoutMs });
 
@@ -438,13 +438,13 @@ async function pullBusiness(slug) {
       if (changedPaths.length === 0) {
         clearInterval(loading);
         process.stdout.write(`\r  Checked ${Object.keys(remoteHashes).length} files in ${Math.floor((Date.now() - startTime) / 1000)}s.${' '.repeat(10)}\n`);
-        // Still need full result for diff logic below — build it from hash-only data
+        // Still need full result for diff logic below, build it from hash-only data
         result = { ok: true, data: { files: hashResult.data.files } };
       } else {
         // Phase 2: fetch ONLY changed files via batch endpoint (not full snapshot)
         clearInterval(loading);
         const checkSec = Math.floor((Date.now() - startTime) / 1000);
-        console.log(`\r  Checked in ${checkSec}s — ${changedPaths.length} changed, ${Object.keys(remoteHashes).length - changedPaths.length} unchanged.${' '.repeat(10)}`);
+        console.log(`\r  Checked in ${checkSec}s, ${changedPaths.length} changed, ${Object.keys(remoteHashes).length - changedPaths.length} unchanged.${' '.repeat(10)}`);
 
         const startPhase2 = Date.now();
         const loading2 = setInterval(() => {
@@ -452,7 +452,7 @@ async function pullBusiness(slug) {
           process.stdout.write(`\r  Fetching ${changedPaths.length} changed files... ${spinner[spinIdx++ % 4]} ${elapsed}s`);
         }, 250);
 
-        // Try batch file read first (fast — only changed files)
+        // Try batch file read first (fast, only changed files)
         const batchUrl = `/business/${businessId}/workspaces/${workspaceId}/files/batch`;
         const batchResult = await apiRequestJson(batchUrl, {
           method: 'POST',
@@ -477,7 +477,7 @@ async function pullBusiness(slug) {
             process.stdout.write(`\r  Fetched in ${fullSec}s.${' '.repeat(20)}\n`);
           }
         } else {
-          // Batch not available — fall back to full snapshot
+          // Batch not available, fall back to full snapshot
           process.stdout.write(`\r  Batch unavailable, fetching full snapshot...${' '.repeat(10)}\n`);
           const contentUrl = `/business/${businessId}/workspaces/${workspaceId}/snapshot?include_content=true${pathsParam}`;
           result = await apiRequestJson(contentUrl, { method: 'GET', token: creds.token, timeoutMs });
@@ -486,14 +486,14 @@ async function pullBusiness(slug) {
         }
       }
     } else {
-      // Hash-only fetch failed — fall back to full snapshot
+      // Hash-only fetch failed, fall back to full snapshot
       const fullUrl = `/business/${businessId}/workspaces/${workspaceId}/snapshot?include_content=true${pathsParam}`;
       result = await apiRequestJson(fullUrl, { method: 'GET', token: creds.token, timeoutMs });
       clearInterval(loading);
       process.stdout.write(`\r  Fetched in ${Math.floor((Date.now() - startTime) / 1000)}s.${' '.repeat(20)}\n`);
     }
   } else {
-    // First sync or --force — full snapshot with content
+    // First sync or --force, full snapshot with content
     const snapshotUrl = `/business/${businessId}/workspaces/${workspaceId}/snapshot?include_content=true${pathsParam}`;
     result = await apiRequestJson(snapshotUrl, { method: 'GET', token: creds.token, timeoutMs });
     clearInterval(loading);
@@ -570,7 +570,7 @@ async function pullBusiness(slug) {
       // Don't early-return: we still need to update the manifest so paths
       // that USED to be in the scoped subtree but were deleted on cloud
       // get evicted from the manifest. Without this, the next push freshness
-      // check would forever flag those paths as drift and demand a pull —
+      // check would forever flag those paths as drift and demand a pull, 
       // but the pull would early-return again, creating a deadlock.
     } else {
       console.log(`  Filtered to ${files.length} files matching: ${onlyPrefixes.join(', ')}`);
@@ -580,7 +580,7 @@ async function pullBusiness(slug) {
   // Build remote file map {path: {hash, size}} and content map {path: content}.
   //
   // CRITICAL: smart-pull (hash-only fetch) returns files with `path`+`hash`+`size`
-  // but no `content`. Phase-2 batch fetch only adds content for CHANGED files —
+  // but no `content`. Phase-2 batch fetch only adds content for CHANGED files, 
   // unchanged files stay hash-only. We must include hash-only entries in remoteFiles
   // so threeWayCompare doesn't see them as missing-from-remote (deletedRemote).
   // The previous version skipped any file without content, which caused every
@@ -598,16 +598,16 @@ async function pullBusiness(slug) {
     // empty files masquerade as hash-only entries; they'd then be recorded in
     // the manifest (with the empty-string hash) but never written to disk.
     // A subsequent push would compare local (file missing) to manifest (file
-    // present) and try to delete the file from cloud — silently undoing the
+    // present) and try to delete the file from cloud, silently undoing the
     // very thing the user just pulled.
     const hasContent = file.content !== null && file.content !== undefined && typeof file.content === 'string';
     if (hasContent) {
-      // Full content available — hash from raw bytes (matches computeLocalHashes)
+      // Full content available, hash from raw bytes (matches computeLocalHashes)
       const rawBytes = Buffer.from(file.content, 'utf-8');
       remoteFiles[normalizedPath] = { hash: crypto.createHash('sha256').update(rawBytes).digest('hex'), size: rawBytes.length };
       remoteContent[normalizedPath] = file.content;
     } else if (file.hash) {
-      // Hash-only entry from smart pull — trust the cloud-reported hash
+      // Hash-only entry from smart pull, trust the cloud-reported hash
       remoteFiles[normalizedPath] = { hash: file.hash, size: file.size || 0 };
     }
   }
@@ -636,7 +636,7 @@ async function pullBusiness(slug) {
     };
   }
 
-  // If output dir is empty (fresh clone) or --force, treat as first sync — pull everything
+  // If output dir is empty (fresh clone) or --force, treat as first sync, pull everything
   const scopedLocalFiles = filterFilesToPullScope(localFiles);
   const scopedRemoteFiles = filterFilesToPullScope(remoteFiles);
   const scopedManifest = filterManifestToPullScope(manifest);
@@ -750,20 +750,20 @@ async function pullBusiness(slug) {
     }
   }
 
-  // FORCE MIRROR SWEEP — local must EXACTLY match cloud after a force pull.
+  // FORCE MIRROR SWEEP, local must EXACTLY match cloud after a force pull.
   // The threeWayCompare path with effectiveManifest=null only computes
   // newLocal/conflicts/newRemote and never marks files as deletedRemote, so
   // local-only files (created locally, never on cloud) survive a force pull.
   // That breaks the "cloud is the source of truth" promise. Sweep them now.
   //
-  // SAFETY GUARDS — without these the sweep can wipe an entire local copy:
+  // SAFETY GUARDS, without these the sweep can wipe an entire local copy:
   //   • Scope the sweep: when --only is set, only sweep paths INSIDE the
-  //     prefix(es). Out-of-scope local files must be left alone — the user
+  //     prefix(es). Out-of-scope local files must be left alone, the user
   //     asked for a partial pull, not a workspace-wide reset.
   //   • Skip when remoteFiles is empty AND local has in-scope content: the
   //     snapshot endpoint has a known server-side bug where it returns 0
   //     files for healthy workspaces. If cloud reports empty but local has
-  //     in-scope content we refuse to sweep — the user can re-run with
+  //     in-scope content we refuse to sweep, the user can re-run with
   //     --keep-local and investigate, or run `atris align --hard` for an
   //     explicit nuke.
   //   • Skip files the server's snapshot filter hides. The warm runner's
@@ -786,11 +786,11 @@ async function pullBusiness(slug) {
 
     // SAFETY: only sweep files atris previously wrote (recorded in the
     // manifest). Local-only files that were never on cloud are the user's
-    // own — atris didn't put them there, atris doesn't delete them. This
+    // own, atris didn't put them there, atris doesn't delete them. This
     // makes it impossible for a stray cwd (e.g. $HOME) to cause atris to
     // wipe ~/Library, ~/Downloads, etc.
     //
-    // If there's no prior manifest (first pull), there's nothing to sweep —
+    // If there's no prior manifest (first pull), there's nothing to sweep, 
     // threeWayCompare already handled newRemote/conflicts/newLocal, and we
     // have no basis for claiming ownership of any local-only file.
     const managedPaths = manifest && manifest.files
@@ -815,7 +815,7 @@ async function pullBusiness(slug) {
           console.log(`  - ${p.replace(/^\//, '')}  not on cloud, removed locally`);
           deleted++;
         } catch {
-          // ignore — file might already be gone
+          // ignore, file might already be gone
         }
       }
     }
@@ -846,7 +846,7 @@ async function pullBusiness(slug) {
       commitHash = headResult.data.commit;
     }
   } catch {
-    // Git might not be initialized yet — that's fine
+    // Git might not be initialized yet, that's fine
   }
 
   if (failOnConflict && conflictCount > 0) {
@@ -878,7 +878,7 @@ async function pullBusiness(slug) {
   // ANTI-WIPE GUARD: if cloud reported zero in-scope files but local still
   // has in-scope content (i.e. the sweep refused), don't overwrite the
   // manifest with empty data for the scoped subtree. The manifest is the
-  // authoritative record of what we last knew was on cloud — wiping it
+  // authoritative record of what we last knew was on cloud, wiping it
   // because of a transient empty snapshot would force every subsequent
   // push to flag every file as drift. Better to leave the manifest stale
   // than to record a never-actually-true "cloud is empty" state.
@@ -893,7 +893,7 @@ async function pullBusiness(slug) {
     }
   }
 
-  // Save manifest — when using --only, merge into existing manifest so paths
+  // Save manifest, when using --only, merge into existing manifest so paths
   // OUTSIDE the scoped prefix don't get dropped. Inside the scoped prefix,
   // however, we must replace (not merge) so that files deleted on cloud
   // since the last sync get evicted from the manifest. Without this, the
@@ -939,7 +939,7 @@ async function pullBusiness(slug) {
 
         const skillFile = path.join(fullPath, 'SKILL.md');
         if (fs.existsSync(skillFile)) {
-          // This is a leaf skill — wire it
+          // This is a leaf skill, wire it
           const skillName = relPrefix ? `${relPrefix}-${entry}` : entry;
           const symlinkPath = path.join(claudeSkillsDir, skillName);
           const relativePath = path.relative(path.dirname(symlinkPath), fullPath);
@@ -982,7 +982,7 @@ async function pullBusiness(slug) {
     }
   }
 
-  // Telemetry — only count files where content actually came over the wire
+  // Telemetry, only count files where content actually came over the wire
   // (smart-pull skips unchanged files and just sends a hash). Counting all
   // remoteFiles here would dwarf the real signal once smart-pull steady-state
   // is normal (< 1% of files transferred per pull).
@@ -1048,12 +1048,12 @@ async function pullGeneralJournal(token, agentId) {
     if (localContent.trim() === remoteContent.trim()) continue;
 
     if (!localContent || localContent.trim() === '') {
-      // No local — just write remote
+      // No local, just write remote
       fs.writeFileSync(logFile, remoteContent);
       console.log(`  Journal ${date} pulled`);
       synced++;
     } else {
-      // Both exist and differ — merge
+      // Both exist and differ, merge
       try {
         const localSections = parseJournalSections(localContent);
         const remoteSections = parseJournalSections(remoteContent);
@@ -1065,7 +1065,7 @@ async function pullGeneralJournal(token, agentId) {
           console.log(`  Journal ${date} merged`);
           synced++;
         } else {
-          // Conflicts — keep local, warn
+          // Conflicts, keep local, warn
           console.log(`  Journal ${date} has conflicts (kept local, run "atris log sync" to resolve)`);
         }
       } catch {

package/commands/pulse.js

@@ -748,7 +748,7 @@ function pulseCommand(argv = []) {
   const sub = argv[0];
   const rest = argv.slice(1);
   if (sub === '--help' || sub === '-h' || sub === 'help') return showHelp();
-  // `pulse <sub> --help` is a help request, not a run — never execute the
+  // `pulse <sub> --help` is a help request, not a run, never execute the
   // subcommand (tick/status/etc. have real side effects) just to show usage.
   if (rest.includes('--help') || rest.includes('-h')) return showHelp();
   switch (sub) {