@astrale-os/cli 1.0.0-beta.26 → 1.0.0-beta.27

package/src/lib/skills.ts

@@ -3,62 +3,11 @@ import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 
 import { findAgentBrowser } from './browser'
-import { run } from './proc'
 
-/**
- * Agent skills and the agent-browser tool are owned by the coding-agent harness
- * (Claude Code et al.) and by npm — not by this CLI. `astrale setup` and
- * `astrale update` only *detect* them and delegate installation to their real
- * installers (`npx skills add`, `npm i -g agent-browser`). This module is that
- * detection + delegation layer.
- */
+export * from './skills/sync'
 
-/** The skill name the agent harness looks up under `<dir>/<name>/SKILL.md`. */
-export const ASTRALE_CLI_SKILL = 'astrale-cli'
-export const ASTRALE_DOMAIN_SKILL = 'astrale-domain'
 export const AGENT_BROWSER_SKILL = 'agent-browser'
 
-/**
- * Published skill source consumed by `npx skills add`. The public `astrale-os/cli`
- * repo hosts BOTH the astrale-cli and astrale-domain skills (under `skills/`), so
- * one `npx skills add astrale-os/cli` installs both; address one with
- * `astrale-os/cli@astrale-cli` or `astrale-os/cli@astrale-domain`.
- */
-export const ASTRALE_CLI_SKILL_SOURCE = 'astrale-os/cli'
-
-/** Human-facing command that installs (or refreshes) both astrale skills, globally. */
-export const SKILL_INSTALL_HINT = `npx skills add ${ASTRALE_CLI_SKILL_SOURCE} -g`
-
-/**
- * Install or refresh the astrale agent skills by delegating to the skill package
- * manager (`npx skills add`). We install GLOBALLY (`-g`, user-level): one run
- * equips every project on the machine — the harness resolves the skills from the
- * user Claude dir (see {@link detectSkill}) regardless of cwd, and installs land
- * in `~/.agents/skills` rather than clobbering any project's own `.agents/skills`
- * (notably this repo's symlinked source). We don't reimplement skill installation
- * — re-running the real installer is also how an existing install updates to the
- * latest published SKILL.md, so this doubles as the update path.
- *
- * We CAPTURE the installer's output rather than stream it, and surface it only on
- * failure. A global install reports a benign per-agent note for any agent format
- * that can't go user-level (e.g. PromptScript: "does not support global skill
- * installation") as a "Failed to install N" banner — even though `npx skills`
- * still exits 0 and the skills land for every other agent. Streaming that made a
- * successful refresh look broken; suppressing it on success lets the caller print
- * a clean line. Resolves true on exit 0. Requires Node/`npx` on PATH + network.
- */
-export async function installSkills(): Promise<boolean> {
-  const { code, stdout, stderr } = await run('npx', [
-    'skills',
-    'add',
-    ASTRALE_CLI_SKILL_SOURCE,
-    '-g',
-    '-y',
-  ])
-  if (code !== 0) process.stderr.write(stdout + stderr)
-  return code === 0
-}
-
 /**
  * The directories the agent harness ACTUALLY loads skills from, in resolution
  * order: a project `.claude/skills` found by walking UP from cwd (the harness

package/src/program/__tests__/program.test.ts

@@ -195,7 +195,7 @@ describe('program composition', () => {
       'whoami',
     ])
     expect(createHash('sha256').update(JSON.stringify(surface)).digest('hex')).toBe(
-      '913d37eab2f603cc745bd9a1c10763a57bc9c2425d0181958d458b80e4a451d7',
+      '2e26ce7e4af960b3ec51401e2c439d1d54c13e06de7afda707aa65e8984bb37b',
     )
   })
 

package/src/setup/steps/skills.ts

@@ -1,59 +1,61 @@
 import type { SetupStep } from '../types'
 
 import { log } from '../../lib/log'
-import {
-  ASTRALE_CLI_SKILL,
-  ASTRALE_DOMAIN_SKILL,
-  detectSkill,
-  installSkills,
-  SKILL_INSTALL_HINT,
-} from '../../lib/skills'
+import { checkAstraleSkills, SKILL_INSTALL_HINT, syncAstraleSkills } from '../../lib/skills'
 
 const FIX = SKILL_INSTALL_HINT
 
 /**
- * Equip — the astrale agent skills. Both the astrale-cli (ops) and astrale-domain
- * (authoring) skills publish from the one public `astrale-os/cli` repo, so a
- * single `npx skills add astrale-os/cli -g` installs both, globally. We don't
- * reimplement skill installation; we detect presence and delegate to `npx skills
- * add` (the skill package manager). A global (user-level) install equips every
- * project on the machine, so a freshly scaffolded domain has the skills without
- * shipping its own copy.
+ * Equip — reconcile every top-level Astrale-owned skill from astrale-os/cli main.
+ * Setup and update deliberately share one owner, so an existence-only setup check
+ * can never bless an incomplete or stale global cohort.
  */
-const bothInstalled = (): boolean =>
-  detectSkill(ASTRALE_CLI_SKILL).installed && detectSkill(ASTRALE_DOMAIN_SKILL).installed
-
 export const skillsStep: SetupStep = {
   id: 'skills',
-  title: 'astrale agent skills (cli + domain)',
+  title: 'Astrale agent skills',
   group: 'equip',
 
   async detect() {
-    if (bothInstalled()) {
-      return { state: 'satisfied', summary: 'astrale-cli + astrale-domain skills installed' }
+    const result = await checkAstraleSkills()
+    if (result.status === 'current') {
+      return { state: 'satisfied', summary: 'Astrale skills are installed and up to date' }
+    }
+    if (result.status === 'unavailable') {
+      return {
+        state: 'broken',
+        summary: 'Astrale skills could not be verified',
+        detail: result.error,
+        fixHint: FIX,
+      }
+    }
+    return {
+      state: 'gap',
+      summary:
+        result.status === 'repair-needed'
+          ? 'Astrale skills need repair'
+          : 'Astrale skills need installation or update',
+      fixHint: FIX,
     }
-    const have = detectSkill(ASTRALE_CLI_SKILL).installed
-      ? 'astrale-domain'
-      : 'astrale agent skills'
-    return { state: 'gap', summary: `${have} not installed`, fixHint: FIX }
   },
 
   async ensure() {
-    if (bothInstalled()) {
-      log.success('astrale-cli + astrale-domain skills already installed')
-      return 'unchanged'
-    }
-
-    log.step(`Installing the astrale agent skills — ${FIX}`)
-    if (!(await installSkills())) {
-      log.warn(`Skill install did not complete — run it later: ${FIX}`)
+    log.step('Ensuring Astrale agent skills are current and healthy')
+    try {
+      const result = await syncAstraleSkills()
+      if (result.status === 'unchanged') {
+        log.success('Astrale skills already up to date')
+        return 'unchanged'
+      }
+      if (result.status === 'installed') log.success('Astrale skills installed')
+      else if (result.status === 'updated') log.success('Astrale skills updated')
+      else if (result.status === 'repaired') log.success('Astrale skills repaired and updated')
+      return 'fixed'
+    } catch (error) {
+      log.warn(
+        `Astrale skills could not be installed safely${error instanceof Error ? `: ${error.message}` : ''}`,
+      )
+      log.dim(`  Retry: ${FIX}`)
       return 'failed'
     }
-    if (bothInstalled()) {
-      log.success('astrale-cli + astrale-domain skills installed')
-    } else {
-      log.success('astrale-cli skill installed')
-    }
-    return 'fixed'
   },
 }