@aiwg/cli 2026.8.17 → 2026.8.19

package/dist/src/smiths/context-pipeline/workspace-context.js

@@ -14,6 +14,7 @@ import { buildNormalizedAiwgMd } from './finalization.js';
 import { getProviderDefinition, listProviderDefinitions, } from '../../providers/provider-definitions.js';
 import { readAiwgConfig } from '../../config/aiwg-config.js';
 import { projectAiwgPath, projectControlPath, resolveProjectAiwgDir, } from '../../config/project-artifacts.js';
+import { dominantLineEnding, withLineEnding } from './line-endings.js';
 export const WORKSPACE_MANAGED_START = '<!-- AIWG:workspace-context:start -->';
 export const WORKSPACE_MANAGED_END = '<!-- AIWG:workspace-context:end -->';
 export const WORKSPACE_OPERATOR_START = '<!-- AIWG:workspace-operator:start -->';
@@ -90,7 +91,8 @@ function replaceBlock(content, start, end, block) {
         return null;
     if (startIndex < 0 || endIndex < startIndex)
         throw new Error(`Malformed managed block: ${start} / ${end}`);
-    return content.slice(0, startIndex) + block + content.slice(endIndex + end.length);
+    const renderedBlock = withLineEnding(block, dominantLineEnding(content));
+    return content.slice(0, startIndex) + renderedBlock + content.slice(endIndex + end.length);
 }
 function stripGeneratedBlocks(content) {
     let stripped = content;

package/dist/src/update/checker.mjs

@@ -15,6 +15,7 @@ import https from 'https';
 import { execSync } from 'child_process';
 import { createInterface } from 'readline';
 import { loadConfig, saveConfig, getChannel, getPackageRoot } from '../channel/manager.mjs';
+import { updateInstallation } from './service.mjs';
 
 const NPM_REGISTRY = 'https://registry.npmjs.org/aiwg';
 
@@ -212,13 +213,13 @@ async function checkStableUpdates(config) {
         console.log('');
         console.log('Updating aiwg...');
         try {
-          execSync('npm install -g aiwg@latest', { stdio: 'inherit' });
+          await updateInstallation({ config, channel: 'stable' });
           console.log('Update complete! Please restart your terminal.');
         } catch (error) {
-          console.error('Update failed. Run manually: npm install -g aiwg@latest');
+          console.error('Update failed. Run manually: aiwg update');
         }
       } else {
-        console.log('Update skipped. Run `npm install -g aiwg@latest` when ready.');
+        console.log('Update skipped. Run `aiwg update` when ready.');
       }
       console.log('');
     }
@@ -251,13 +252,13 @@ async function checkNextUpdates(config) {
         console.log('');
         console.log('Updating aiwg@next...');
         try {
-          execSync('npm install -g aiwg@next', { stdio: 'inherit' });
+          await updateInstallation({ config, channel: 'next' });
           console.log('Update complete! Please restart your terminal.');
         } catch {
-          console.error('Update failed. Run manually: npm install -g aiwg@next');
+          console.error('Update failed. Run manually: aiwg update');
         }
       } else {
-        console.log('Update skipped. Run `npm install -g aiwg@next` when ready.');
+        console.log('Update skipped. Run `aiwg update` when ready.');
       }
       console.log('');
     }
@@ -290,13 +291,13 @@ async function checkNightlyUpdates(config) {
         console.log('');
         console.log('Updating aiwg@nightly...');
         try {
-          execSync('npm install -g aiwg@nightly', { stdio: 'inherit' });
+          await updateInstallation({ config, channel: 'nightly' });
           console.log('Update complete! Please restart your terminal.');
         } catch {
-          console.error('Update failed. Run manually: npm install -g aiwg@nightly');
+          console.error('Update failed. Run manually: aiwg update');
         }
       } else {
-        console.log('Update skipped. Run `npm install -g aiwg@nightly` when ready.');
+        console.log('Update skipped. Run `aiwg update` when ready.');
       }
       console.log('');
     }
@@ -348,13 +349,13 @@ export async function forceUpdateCheck() {
     console.log('Checking for updates on next channel...');
     const latestVersion = await fetchNpmDistTag('next');
     if (!latestVersion) {
-      console.log('Could not check npm registry. Try: npm install -g aiwg@next');
+      console.log('Could not check npm registry. Try: aiwg update');
       return;
     }
     if (currentVersion !== latestVersion) {
       console.log(`Update available: ${currentVersion} → ${latestVersion}`);
       console.log('');
-      console.log('Run: npm install -g aiwg@next');
+      console.log('Run: aiwg update');
     } else {
       console.log(`You are on the latest next release: ${currentVersion}`);
     }
@@ -362,13 +363,13 @@ export async function forceUpdateCheck() {
     console.log('Checking for updates on nightly channel...');
     const latestVersion = await fetchNpmDistTag('nightly');
     if (!latestVersion) {
-      console.log('Could not check npm registry. Try: npm install -g aiwg@nightly');
+      console.log('Could not check npm registry. Try: aiwg update');
       return;
     }
     if (currentVersion !== latestVersion) {
       console.log(`Update available: ${currentVersion} → ${latestVersion}`);
       console.log('');
-      console.log('Run: npm install -g aiwg@nightly');
+      console.log('Run: aiwg update');
     } else {
       console.log(`You are on the latest nightly snapshot: ${currentVersion}`);
     }
@@ -381,14 +382,14 @@ export async function forceUpdateCheck() {
     const latestVersion = await fetchLatestNpmVersion();
 
     if (!latestVersion) {
-      console.log('Could not check npm registry. Try: npm install -g aiwg@latest');
+      console.log('Could not check npm registry. Try: aiwg update');
       return;
     }
 
     if (isNewerVersion(currentVersion, latestVersion)) {
       console.log(`Update available: ${currentVersion} → ${latestVersion}`);
       console.log('');
-      console.log('Run: npm install -g aiwg@latest');
+      console.log('Run: aiwg update');
     } else {
       console.log(`You are on the latest version: ${currentVersion}`);
     }

package/dist/src/update/notifier.mjs

@@ -27,12 +27,13 @@
 
 import https from 'https';
 import path from 'path';
-import os from 'os';
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
 import { spawn } from 'child_process';
 import { fileURLToPath } from 'url';
+import { resolveUserConfigDir } from '../config/user-config-dir.mjs';
+import { loadInstallationIdentity } from '../installation/manager.mjs';
 
-const CACHE_DIR = path.join(os.homedir(), '.aiwg');
+const CACHE_DIR = resolveUserConfigDir();
 const CACHE_FILE = path.join(CACHE_DIR, 'update-notifier.json');
 
 /**
@@ -191,11 +192,13 @@ async function runCheck(packageRoot) {
  */
 export function scheduleBackgroundCheck(packageRoot) {
   if (isDisabled()) return;
+  const installation = loadInstallationIdentity({ actualRoot: packageRoot, createIfMissing: false });
+  if (installation?.checkOnStartup === false) return;
 
   const cache = readCache();
   if (cacheMatchesPackage(cache, packageRoot) && cache?.lastCheckAt) {
     const age = Date.now() - new Date(cache.lastCheckAt).getTime();
-    if (age < CHECK_INTERVAL_MS) return; // recent enough — skip
+    if (age < (installation?.updateCheckInterval ?? CHECK_INTERVAL_MS)) return; // recent enough — skip
   }
 
   try {
@@ -225,6 +228,8 @@ export function scheduleBackgroundCheck(packageRoot) {
  */
 export function maybePrintNotice(packageRoot) {
   if (isDisabled()) return;
+  const installation = loadInstallationIdentity({ actualRoot: packageRoot, createIfMissing: false });
+  if (installation?.checkOnStartup === false) return;
   const cache = readCache();
   if (!cacheMatchesPackage(cache, packageRoot)) return;
   if (!cache?.hasUpdate || !cache.current || !cache.latest) return;

package/dist/src/update/service.mjs

@@ -10,6 +10,13 @@ import { execFileSync } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
 import { getPackageRoot, loadConfig } from '../channel/manager.mjs';
+import {
+  assertCanonicalInstallation,
+  createInstallationIdentity,
+  loadInstallationIdentity,
+  saveInstallationIdentity,
+} from '../installation/manager.mjs';
+import { resolveManagerCommand } from '../installation/manager-command.mjs';
 
 const VALID_MODES = new Set(['npm', 'web', 'source']);
 
@@ -24,14 +31,42 @@ function readPackageName(packageRoot) {
 export async function detectInstallMode(options = {}) {
   const packageRoot = options.packageRoot ?? getPackageRoot();
   const override = options.env?.AIWG_INSTALL_MODE ?? process.env.AIWG_INSTALL_MODE;
+  const config = options.config ?? await loadConfig(options);
+  let identity = options.identity ?? config.installation ?? null;
+  let identityPersistent = Boolean(config.installation) || options.identityPersistent === true;
+  if (!identity && options.config) {
+    const method = override ?? (readPackageName(packageRoot) === '@aiwg/cli'
+      ? 'web'
+      : (config.devMode || config.channel === 'edge' || existsSync(path.join(packageRoot, '.git'))) ? 'source' : 'npm');
+    identity = createInstallationIdentity({
+      ...options,
+      actualRoot: packageRoot,
+      method,
+      channel: config.channel,
+      runMode: config.devMode ? 'development' : undefined,
+    });
+  } else if (!identity) {
+    identity = loadInstallationIdentity({ ...options, actualRoot: packageRoot });
+    identityPersistent = Boolean(identity);
+  }
+
+  if (override && !VALID_MODES.has(override)) {
+    throw new Error(`AIWG_INSTALL_MODE must be one of: ${[...VALID_MODES].join(', ')}`);
+  }
+  if (override && identity && override !== identity.method) {
+    throw new Error(`AIWG_INSTALL_MODE=${override} conflicts with the canonical installation method ${identity.method}. Use \`aiwg installation switch\` instead.`);
+  }
+  if (identity) {
+    const status = assertCanonicalInstallation({ ...options, actualRoot: packageRoot, identity });
+    return { mode: identity.method, packageRoot, packageName: readPackageName(packageRoot), identity, identityPersistent, installation: status };
+  }
+
   if (override) {
     if (!VALID_MODES.has(override)) {
       throw new Error(`AIWG_INSTALL_MODE must be one of: ${[...VALID_MODES].join(', ')}`);
     }
     return { mode: override, packageRoot, packageName: readPackageName(packageRoot) };
   }
-
-  const config = options.config ?? await loadConfig();
   const packageName = readPackageName(packageRoot);
   if (packageName === '@aiwg/cli') return { mode: 'web', packageRoot, packageName };
   if (config.devMode || config.channel === 'edge' || existsSync(path.join(packageRoot, '.git'))) {
@@ -56,7 +91,7 @@ function npmTag(channel) {
 export async function updateInstallation(options = {}) {
   const config = options.config ?? await loadConfig();
   const detected = await detectInstallMode({ ...options, config });
-  const channel = options.channel ?? config.channel ?? 'stable';
+  const channel = options.channel ?? detected.identity?.channel ?? config.channel ?? 'stable';
   const dryRun = options.dryRun === true;
   const offline = options.offline === true;
 
@@ -84,6 +119,9 @@ export async function updateInstallation(options = {}) {
       return resolveWebRelease({ selector });
     });
     const release = await refreshWebResources(channel);
+    if (detected.identity && detected.identityPersistent && options.persistIdentity !== false) {
+      saveInstallationIdentity({ ...detected.identity, channel }, options);
+    }
     return {
       ...detected,
       channel,
@@ -106,16 +144,24 @@ export async function updateInstallation(options = {}) {
 
   const tag = npmTag(channel);
   const command = ['install', '--global', `aiwg@${tag}`];
+  const managerExecutable = detected.identity?.managerExecutable;
+  if (!managerExecutable) {
+    throw new Error('Canonical npm installation has no package-manager executable. Run `aiwg installation adopt --manager <absolute-path-to-npm>`.');
+  }
   if (!dryRun) {
+    const invocation = resolveManagerCommand(managerExecutable, command, options);
     const execute = options.execute ?? ((file, args) => execFileSync(file, args, { stdio: 'inherit' }));
-    execute('npm', command);
+    execute(invocation.file, invocation.args);
+    if (detected.identity && detected.identityPersistent && options.persistIdentity !== false) {
+      saveInstallationIdentity({ ...detected.identity, channel }, options);
+    }
   }
   return {
     ...detected,
     channel,
     status: dryRun ? 'dry-run' : 'updated',
     changed: !dryRun,
-    command: `npm ${command.join(' ')}`,
+    command: `${managerExecutable} ${command.join(' ')}`,
     message: dryRun
       ? `Would update the full AIWG npm distribution on the '${tag}' channel.`
       : `Updated the full AIWG npm distribution on the '${tag}' channel.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiwg/cli",
-  "version": "2026.8.17",
+  "version": "2026.8.19",
   "description": "Lightweight AIWG CLI for signed, versioned web-backed resources.",
   "type": "module",
   "license": "MIT",

package/tools/agents/deploy-agents.mjs

@@ -340,7 +340,7 @@ function mirrorSkillsAsCommands(provider, target, srcRoot, opts) {
  * @param {string|null} explicitSource the raw `--source` value (null when unset)
  */
 function pruneStaleAiwgArtifacts(provider, target, srcRoot, opts, explicitSource) {
-  if (opts.skillsOnly) return; // skills run their own prune in the provider
+  if (opts.skillsOnly && !opts.kernelOnly) return; // skills run their own prune in the provider
 
   const aiwgRoot = resolveAiwgRoot(srcRoot);
   if (!aiwgRoot) return; // no AIWG tree → bundle/standalone deploy; never prune
@@ -355,6 +355,20 @@ function pruneStaleAiwgArtifacts(provider, target, srcRoot, opts, explicitSource
     if (!underCode) return; // project-local bundle / external source → skip
   }
 
+  if (opts.kernelOnly) {
+    for (const type of ['agents', 'commands', 'rules']) {
+      const relPath = provider.paths?.[type];
+      if (!relPath || relPath.endsWith('.md')) continue;
+      const destDir = path.isAbsolute(relPath) ? relPath : path.join(target, relPath);
+      pruneStaleAiwgFiles(destDir, new Set(), {
+        dryRun: opts.dryRun,
+        verbose: opts.verbose,
+        artifactExtensions: ['.md', '.mdc', '.toml'],
+      });
+    }
+    return;
+  }
+
   const typesThisRun = [];
   if (!opts.commandsOnly && !opts.rulesOnly) typesThisRun.push('agents');
   if (opts.deployCommands || opts.commandsOnly) typesThisRun.push('commands');
@@ -406,6 +420,7 @@ function parseArgs() {
     commandsOnly: false,
     skillsOnly: false,
     rulesOnly: false,
+    kernelOnly: false,
     filter: null,           // Glob pattern for agent names
     filterRole: null,       // Filter by role: reasoning|coding|efficiency
     save: false,            // Save model config to project models.json
@@ -438,6 +453,7 @@ function parseArgs() {
     else if (a === '--commands-only') cfg.commandsOnly = true;
     else if (a === '--skills-only') cfg.skillsOnly = true;
     else if (a === '--rules-only') cfg.rulesOnly = true;
+    else if (a === '--kernel-only') cfg.kernelOnly = true;
     else if (a === '--deploy-behaviors') cfg.deployBehaviors = true;
     else if (a === '--filter' && args[i + 1]) cfg.filter = args[++i];
     else if (a === '--filter-role' && args[i + 1]) cfg.filterRole = args[++i];
@@ -474,6 +490,7 @@ Options:
   --commands-only          Deploy only commands (skip agents)
   --skills-only            Deploy only skills (skip agents)
   --rules-only             Deploy only rules (skip agents)
+  --kernel-only            Deploy kernel skills only and prune managed bulk artifacts
   --dry-run                Show what would be deployed without writing
   --force                  Overwrite existing files
   --provider <name>        Target provider (see below)
@@ -490,7 +507,9 @@ Options:
   --create-agents-md           Create/update AGENTS.md template
   --skip-commands-migration    Skip deleting the commands directory before skills deployment
   --copy-all                   Copy ALL skills per-project (legacy mirror at <provider>/.aiwg/skills/).
-                               Default is kernel-only + index-driven discovery for the rest (#1217).
+                               For aiwg use all, this also restores the legacy full agent,
+                               command, and expanded-rule copy. Default bulk deployment is
+                               kernel-only + index-driven discovery for the rest (#1217).
                                Use this for sandboxed runtimes / air-gapped corpora where
                                $AIWG_ROOT isn't readable from the agent's working dir.
                                Alias: --copy-standard-skills — rc.29 era).
@@ -879,13 +898,14 @@ export async function main() {
     modelsConfig,
     asAgentsMd: cfg.asAgentsMd,
     createAgentsMd: cfg.createAgentsMd,
-    deployCommands: cfg.deployCommands,
-    deploySkills: cfg.deploySkills,
-    deployRules: cfg.deployRules,
-    deployBehaviors: cfg.deployBehaviors,
+    deployCommands: cfg.kernelOnly ? false : cfg.deployCommands,
+    deploySkills: cfg.kernelOnly ? true : cfg.deploySkills,
+    deployRules: cfg.kernelOnly ? false : cfg.deployRules,
+    deployBehaviors: cfg.kernelOnly ? false : cfg.deployBehaviors,
     commandsOnly: cfg.commandsOnly,
-    skillsOnly: cfg.skillsOnly,
+    skillsOnly: cfg.skillsOnly || cfg.kernelOnly,
     rulesOnly: cfg.rulesOnly,
+    kernelOnly: cfg.kernelOnly,
     filter: cfg.filter,
     filterRole: cfg.filterRole,
     save: cfg.save,
@@ -893,7 +913,7 @@ export async function main() {
     verbose: cfg.verbose,
     quiet: cfg.quiet,
     asPlugin: cfg.asPlugin,
-    deployBehaviors: cfg.deployBehaviors,
+    deployBehaviors: cfg.kernelOnly ? false : cfg.deployBehaviors,
     skipCommandsMigration: cfg.skipCommandsMigration,
     // #1217 / #1219: --copy-all flag forces legacy per-project mirror
     // for the standard tier. Default is no-copy + index-driven discovery.

package/tools/agents/providers/base.mjs

@@ -1183,7 +1183,7 @@ export function computeAllKernelNames(srcRoot) {
  *   located — see `computeAllKernelNames`), pruning is skipped entirely so a
  *   project-local-bundle deploy without AIWG_ROOT never empties the kernel
  *   skills directory (#123).
- * @param {object} opts `{ dryRun, verbose }`
+ * @param {object} opts `{ dryRun, verbose, artifactExtensions }`
  * @returns {number} count of pruned entries
  */
 export function pruneStaleAiwgSkills(kernelDestDir, desiredKernelNames, opts = {}) {
@@ -1348,7 +1348,8 @@ export function resolveAiwgRoot(srcRoot) {
  * `pruneStaleAiwgSkills`.
  *
  * Removes a file from `destDir` only when ALL hold:
- *   1. It is a deployed artifact file (`.md` / `.mdc`), not `RULES-INDEX.md`
+ *   1. It has an allowed deployed-artifact extension (`.md` / `.mdc` by
+ *      default; callers may include `.toml`), is not `RULES-INDEX.md`,
  *      and not the sidecar manifest.
  *   2. Its stem is NOT in `desiredStems` (the source no longer ships it).
  *   3. It carries an AIWG ownership signal — either a `.aiwg-manifest.json`
@@ -1369,6 +1370,7 @@ export function resolveAiwgRoot(srcRoot) {
  */
 export function pruneStaleAiwgFiles(destDir, desiredStems, opts = {}) {
   const { dryRun = false, verbose = false } = opts;
+  const artifactExtensions = opts.artifactExtensions || ['.md', '.mdc'];
   const removed = [];
   if (!destDir || !fs.existsSync(destDir)) return removed;
 
@@ -1391,7 +1393,7 @@ export function pruneStaleAiwgFiles(destDir, desiredStems, opts = {}) {
     if (name === 'RULES-INDEX.md') continue;
     if (name === 'RULES-ONDEMAND.md') continue; // generated on-demand index (#1673)
     const lower = name.toLowerCase();
-    if (!lower.endsWith('.md') && !lower.endsWith('.mdc')) continue;
+    if (!artifactExtensions.some(extension => lower.endsWith(extension))) continue;
 
     if (desired.has(artifactStem(name))) continue;