@erclx/canon 5.54.0 → 5.55.0

package/src/sandbox/provision.ts

@@ -27,7 +27,7 @@ import {
   logStep,
   logWarn,
   outro,
-  palette,
+  outroSuccess,
   select,
 } from '@/cli/ui'
 
@@ -99,9 +99,7 @@ function readGit(cwd: string, args: string[]): string | undefined {
 }
 
 function finish(message: string): void {
-  const { GREEN, NC } = palette(process.stderr)
-  outro()
-  process.stderr.write(`\n${GREEN}${message}${NC}\n`)
+  outroSuccess(message)
 }
 
 function stageAnchorTree(
@@ -210,7 +208,7 @@ function install(
   env: NodeJS.ProcessEnv,
 ): void {
   const result = spawnSync('bun', [join(root, 'src', 'cli.ts'), ...args], {
-    env: { ...env, CANON_NON_INTERACTIVE: '1' },
+    env,
     encoding: 'utf8',
     stdio: ['ignore', 'ignore', 'pipe'],
   })
@@ -432,10 +430,7 @@ async function provisionScenario(
   baseEnv: NodeJS.ProcessEnv,
 ): Promise<void> {
   const env: NodeJS.ProcessEnv = { ...baseEnv }
-  if (scenario.arm !== undefined) {
-    env.SANDBOX_SCENARIO = scenario.arm
-    env.CANON_NON_INTERACTIVE = '1'
-  }
+  if (scenario.arm !== undefined) env.SANDBOX_SCENARIO = scenario.arm
 
   const sandboxDir = join(root, 'sandbox')
   const declared = declareScenario(root, scenario, env)
@@ -475,14 +470,14 @@ async function provisionScenario(
   must(commitScenarioChanges(sandbox, isSkipAutoCommit, env))
   tagBaseline(sandbox, env)
 
-  finish('✓ Sandbox Ready')
+  finish('Sandbox Ready')
 }
 
 function cleanSandbox(sandbox: string): void {
   logStep('Removing sandbox')
   rmSync(sandbox, { recursive: true, force: true })
   logRemove(sandbox)
-  finish('✓ Sandbox clean')
+  finish('Sandbox clean')
 }
 
 function isAtBaseline(sandbox: string): boolean {
@@ -520,7 +515,7 @@ async function resetSandbox(sandbox: string): Promise<void> {
 
   if (isAtBaseline(sandbox)) {
     logInfo('At baseline')
-    finish('✓ Sandbox at baseline')
+    finish('Sandbox at baseline')
     return
   }
 
@@ -556,7 +551,7 @@ async function resetSandbox(sandbox: string): Promise<void> {
     must(run('git', ['checkout-index', '-a', '-f'], quiet))
   }
   logInfo('Sandbox reset to baseline')
-  finish('✓ Sandbox reset complete')
+  finish('Sandbox reset complete')
 }
 
 /**

package/src/sandbox/scenario.ts

@@ -13,6 +13,7 @@ import {
 import { createRequire } from 'node:module'
 import { dirname, join, relative } from 'node:path'
 import {
+  isNonInteractive,
   logError,
   logInfo,
   logStep,
@@ -580,8 +581,9 @@ export function createStageContext(options: ContextOptions): StageContext {
 }
 
 /**
- * Picks the arm: a routed name first,
- * echoed on the frame, then the first arm for a headless caller, then a prompt.
+ * Picks the arm: a routed name first, echoed on the frame, then a prompt. A
+ * headless caller naming no arm is refused rather than handed the first one,
+ * since a verdict on an arm nobody chose reads as a verdict on the scenario.
  */
 async function routeArm(
   names: readonly string[],
@@ -600,17 +602,9 @@ async function routeArm(
   const routed = env.SANDBOX_SCENARIO ?? ''
   if (routed !== '') return echo(routed)
 
-  // Read off the scenario's environment rather than this process's, as
-  // `is_non_interactive` read the shell it ran in.
-  const isHeadless =
-    env.CANON_NON_INTERACTIVE === '1' ||
-    // canon-keep-retired
-    env.AITK_NON_INTERACTIVE === '1'
-  if (isHeadless) return echo(names[0] ?? DEFAULT_ARM_NAME)
-
-  if (!process.stdin.isTTY) {
+  if (isNonInteractive()) {
     logError(
-      `${prompt} requires a TTY. Pass an argument or set CANON_NON_INTERACTIVE=1.`,
+      `${prompt} requires a TTY. Pass the arm as the scenario argument, one of: ${names.join(', ')}.`,
     )
     throw new ScenarioStop(1, 'exited')
   }

package/src/sync/engine.ts

@@ -26,7 +26,7 @@ import {
   logStep,
   logWarn,
   outro,
-  palette,
+  outroSuccess,
   select,
 } from '@/cli/ui'
 import { compareVersions, parseVersion } from '@/version/compare'
@@ -436,7 +436,6 @@ export async function runDomainSync(
   }
 
   const plan = planSync(adapter, resolved)
-  const { GREEN, GREY, NC } = palette(process.stderr)
 
   if (
     !existsSync(adapter.installedRoot(resolved)) &&
@@ -453,8 +452,7 @@ export async function runDomainSync(
   if (count === 0) {
     await adapter.onComplete?.(resolved)
     await recordStamp(adapter, resolved, new Date())
-    outro()
-    process.stderr.write(`${GREEN}✓ Everything up to date${NC}\n`)
+    outroSuccess('Everything up to date')
     return 0
   }
 
@@ -489,10 +487,7 @@ export async function runDomainSync(
   await adapter.onComplete?.(resolved)
   await recordStamp(adapter, resolved, new Date())
 
-  outro()
-  process.stderr.write(
-    `${GREEN}✓ Sync complete${NC} ${GREY}(${count} ${adapter.unit})${NC}\n`,
-  )
+  outroSuccess('Sync complete', `(${count} ${adapter.unit})`)
   return 0
 }
 

package/src/sync/workflow.ts

@@ -19,7 +19,7 @@ import {
   logStep,
   logWarn,
   outro,
-  palette,
+  outroSuccess,
   pipeOutput,
   select,
 } from '@/cli/ui'
@@ -75,7 +75,7 @@ export async function collectChanges(git: GitRunner): Promise<DomainChange[]> {
  *
  * This is the only toolkit code that writes to a git remote, which is why a
  * headless run refuses it outright. `select_option` resolved to its first
- * option under `CANON_NON_INTERACTIVE=1`, and the first option here was
+ * option with no terminal to answer it, and the first option here was
  * `Commit and open PR` whenever `gh` was installed, so an agent following the
  * documented non-interactive path pushed a branch and opened a pull request on
  * someone's repository without being asked.
@@ -193,8 +193,6 @@ function promptChoice(canOpenPullRequest: boolean): Promise<WorkflowChoice> {
 }
 
 function succeed(message: string): number {
-  const { GREEN, NC } = palette(process.stderr)
-  outro()
-  process.stderr.write(`\n${GREEN}✓ ${message}${NC}\n`)
+  outroSuccess(message)
   return 0
 }

package/src/tooling/verify-stack.ts

@@ -124,7 +124,7 @@ async function run({
   await phase(state, 'Sync', () =>
     execa('bun', [cli, 'tooling', 'sync', stack, '.', '--write'], {
       ...captured(state.dir),
-      env: { CI: '1', CANON_NON_INTERACTIVE: '1' },
+      env: { CI: '1' },
     }),
   )
 

package/tooling/base/configs/.husky/post-merge

@@ -27,20 +27,16 @@ if ! command -v canon >/dev/null 2>&1; then
   exit 0
 fi
 
-# A global binary older than the verb cannot run it, and the verb carries the
-# only step that would update it, so reinstall here and probe again. The probe
-# reads the verb's own usage line rather than the exit, since an older binary
-# answers an unknown command's `--help` with its root help and exits zero.
+# A global binary older than the verb cannot run it, and its owner upgrades it
+# by hand. The probe reads the verb's own usage line rather than the exit,
+# since an older binary answers an unknown command's `--help` with its root
+# help and exits zero.
 has_verb() {
   canon hooks post-merge --help 2>/dev/null | grep -q '^Usage: canon hooks post-merge'
 }
 
-if ! has_verb; then
-  if [ -z "$CANON_SKIP_UPGRADE" ]; then
-    CANON_NON_INTERACTIVE=1 canon upgrade >/dev/null 2>&1 || true
-  fi
-fi
-
 if has_verb; then
   canon hooks post-merge --root "$root" || true
+else
+  echo 'canon is too old to run the post-merge hook. Run `canon upgrade`.' >&2
 fi

package/scripts/core/check-color-source.sh

@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-set -e
-set -o pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="${PROJECT_ROOT:-$(cd "$SCRIPT_DIR/../.." && pwd)}"
-
-SCRIPTS_ROOT="$PROJECT_ROOT/scripts"
-SANDBOX_ROOT="$PROJECT_ROOT/sandbox"
-PALETTE_SOURCE="$SCRIPTS_ROOT/lib/ui.sh"
-
-# `find` writes to stderr and returns non-zero for a missing root, inside a
-# process substitution whose status nothing reads. Without this the walk covers
-# nothing and the check reports the tree clean having never measured it.
-if [ ! -f "$PALETTE_SOURCE" ]; then
-  echo "No palette source at ${PALETTE_SOURCE#"$PROJECT_ROOT/"}, color sourcing unverifiable." >&2
-  exit 1
-fi
-
-# The same silence follows a root that moved, so a walked root that is gone
-# fails here rather than shrinking the corpus with no message.
-for root in "$SCRIPTS_ROOT" "$SANDBOX_ROOT"; do
-  if [ ! -d "$root" ]; then
-    echo "No shell root at ${root#"$PROJECT_ROOT/"}, color sourcing unverifiable." >&2
-    exit 1
-  fi
-done
-
-# Any SGR sequence in either spelling. The cursor and erase sequences an
-# interactive prompt writes end in a letter instead, and they run only where a
-# terminal already exists, so they are not what this measures.
-SGR='\\(033|e|x1b)\[[0-9;]*m'
-
-# Sixteen copies of one decision is what made color impossible to turn off on
-# the TypeScript side. A rule nothing enforces rebuilds them the next time a
-# script wants grey, so the escape lives in the shared library and every other
-# script reads the palette that library derives for its stream.
-offenders=""
-while IFS= read -r file; do
-  [ "$file" = "$PALETTE_SOURCE" ] && continue
-  if grep -qE "$SGR" "$file"; then
-    offenders="$offenders  ${file#"$PROJECT_ROOT/"}"$'\n'
-  fi
-done < <(find "$SCRIPTS_ROOT" "$SANDBOX_ROOT" -type f -name '*.sh')
-
-if [ -n "$offenders" ]; then
-  echo "A color escape is defined outside the shared library:" >&2
-  printf '%s' "$offenders" >&2
-  echo "Source scripts/lib/ui.sh and read its palette, so one answer covers every writer." >&2
-  exit 1
-fi