@inneranimalmedia/agentsam-sdk 2.6.4 → 2.6.5

package/src/commands/terminal.js

@@ -0,0 +1,171 @@
+/**
+ * Device identity + ExecOS pairing.
+ *
+ * Two AgentSam lanes (see docs/contracts/environment-vocabulary.md):
+ *   AGENTSAM_API_KEY    — account / human (CLI, whoami, mint enrollment)
+ *   AGENTSAM_BRIDGE_KEY — one ExecOS terminal_connection (enroll --pair writes it)
+ *
+ * local_device PTY daemons enroll with connection_token → AGENTSAM_BRIDGE_KEY
+ * in ~/.execos/profiles/<instance_id>.env. IAM_CONNECTION_KEY is retired
+ * (dual-read only during migration).
+ */
+import { spawnSync } from 'node:child_process';
+import path from 'node:path';
+import { homedir } from 'node:os';
+import { postJson } from '../lib/core-client.js';
+import { collectMachineIdentity } from '../lib/terminal/machine-identity.js';
+
+function flag(argv, name) {
+  const index = argv.indexOf(name);
+  if (index === -1) return null;
+  const value = argv[index + 1];
+  if (!value || value.startsWith('--')) return null;
+  return value;
+}
+
+function printIdentity(identity, write) {
+  write(`hostname:  ${identity.hostname || 'unknown'}`);
+  write(`platform:  ${identity.platform || 'unknown'}`);
+  write(`arch:      ${identity.arch || 'unknown'}`);
+  write(`hw_model:  ${identity.model || 'unknown'}`);
+}
+
+function defaultExecosEnrollBin() {
+  return path.join(homedir(), 'ExecOS', 'bin', 'enroll.mjs');
+}
+
+function pairWithExecos(enrollmentToken, options = {}) {
+  const enrollBin = options.enrollBin || process.env.EXECOS_ENROLL_BIN || defaultExecosEnrollBin();
+  const endpoint = options.endpoint || null;
+  const args = [enrollBin, '--token', enrollmentToken, '--force'];
+  if (endpoint) args.push('--tunnel-url', endpoint);
+  const result = spawnSync(process.execPath, args, {
+    stdio: 'inherit',
+    env: process.env,
+  });
+  return {
+    ok: (result.status ?? 1) === 0,
+    status: result.status ?? 1,
+    enroll_bin: enrollBin,
+  };
+}
+
+export async function runTerminal(argv = [], options = {}) {
+  const write = options.write || ((line) => console.log(line));
+  const sub = argv[0] && !argv[0].startsWith('--') ? argv[0] : 'identity';
+  const json = argv.includes('--json') || options.json === true;
+  const pair = argv.includes('--pair') || options.pair === true;
+  const identity = await (options.collectIdentity || collectMachineIdentity)();
+  const payload = {
+    hostname: identity.hostname || null,
+    platform: identity.platform || null,
+    arch: identity.arch || null,
+    hw_model: identity.model || null,
+  };
+
+  if (sub === 'identity') {
+    if (json) write(JSON.stringify(payload));
+    else printIdentity(identity, write);
+    return { ok: true, ...payload };
+  }
+
+  if (sub !== 'enroll') {
+    write([
+      'Usage: agentsam terminal identity [--json]',
+      '       agentsam terminal enroll --instance <id> [--endpoint <url>] [--pair] [--json]',
+      '',
+      'Lanes:',
+      '  AGENTSAM_API_KEY      account (CLI / whoami / mint enrollment) — required for this command',
+      '  AGENTSAM_BRIDGE_KEY   one terminal_connection secret (written by --pair into ExecOS profile)',
+    ].join('\n'));
+    return { ok: false, error: 'terminal_usage' };
+  }
+
+  const instanceId = flag(argv, '--instance') || options.instanceId || null;
+  const endpoint = flag(argv, '--endpoint') || options.endpoint || null;
+  if (!instanceId && !endpoint) {
+    if (json) {
+      write(JSON.stringify({ ...payload, enrolled: false, reason: 'instance_or_endpoint_required' }));
+    } else {
+      printIdentity(identity, write);
+      write('');
+      write('Pass --instance <id> to stamp/re-pair an existing device, or --endpoint <url> for a new local_device.');
+      write('Requires AGENTSAM_API_KEY in the shell (source ~/.agentsam/load-agent-env.sh).');
+      write('Add --pair to mint a connection_token and run ExecOS enroll (writes AGENTSAM_BRIDGE_KEY).');
+    }
+    return { ok: true, enrolled: false, ...payload };
+  }
+
+  const body = {
+    hostname: payload.hostname,
+    platform: payload.platform,
+    arch: payload.arch,
+    hw_model: payload.hw_model,
+    kind: 'local_device',
+    name: payload.hostname || undefined,
+  };
+  if (instanceId) {
+    body.instance_id = instanceId;
+    body.create_transport = false;
+  }
+  if (endpoint) body.endpoint_url = endpoint;
+
+  const post = options.postJson || postJson;
+  let result;
+  try {
+    result = await post('/api/terminal/connections/enrollment-token', body, options);
+  } catch (error) {
+    const message = error?.message || String(error);
+    if (json) {
+      write(JSON.stringify({ ok: false, error: message, ...payload }));
+    } else {
+      write(`enroll failed: ${message}`);
+      if (/Unauthorized|SESSION_MISSING|IAM_OAUTH_ISSUER/i.test(message)) {
+        write('next: source ~/.agentsam/load-agent-env.sh   # AGENTSAM_API_KEY + IAM_OAUTH_ISSUER');
+      }
+    }
+    return { ok: false, error: message, ...payload };
+  }
+
+  const out = {
+    ...payload,
+    enrolled: true,
+    instance_id: result?.instance_id || null,
+    connection_id: result?.connection_id || null,
+    enrollment_token_id: result?.enrollment_token_id || null,
+    auth_mode: 'connection_token',
+  };
+
+  let paired = null;
+  if (pair && result?.enrollment_token) {
+    if (options.pairImpl) {
+      paired = await options.pairImpl(result.enrollment_token, { endpoint: result.endpoint_url || endpoint });
+    } else {
+      paired = pairWithExecos(result.enrollment_token, {
+        endpoint: result.endpoint_url || endpoint,
+        enrollBin: options.enrollBin,
+      });
+    }
+    out.paired = paired?.ok === true;
+  }
+
+  if (json) write(JSON.stringify({ ...out, enrollment_token: pair ? undefined : (result?.enrollment_token || null) }));
+  else {
+    write(`instance:   ${out.instance_id || 'unknown'}`);
+    write(`connection: ${out.connection_id || 'unknown'}`);
+    printIdentity(identity, write);
+    write('auth_mode:  connection_token → AGENTSAM_BRIDGE_KEY (one terminal_connection)');
+    write('account:    AGENTSAM_API_KEY (CLI / whoami — keep loaded in the shell)');
+    if (pair) {
+      write(paired?.ok ? '✓ ExecOS paired — AGENTSAM_BRIDGE_KEY written to private profile' : '✗ ExecOS pair failed');
+    } else if (result?.enrollment_token) {
+      write('Finish on that machine: node ~/ExecOS/bin/enroll.mjs --token <token> --force');
+    }
+  }
+  return {
+    ok: true,
+    ...out,
+    enrollment_token: result?.enrollment_token || null,
+    pair_result: paired,
+  };
+}

package/src/commands/update.js

@@ -0,0 +1,140 @@
+/**
+ * gcloud-like update preview. Does not silently upgrade.
+ */
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import pkg from '../../package.json' with { type: 'json' };
+
+const execFileAsync = promisify(execFile);
+
+function writeLine(write, value = '') {
+  write(`${value}\n`);
+}
+
+async function latestNpmVersion(name, env) {
+  try {
+    const { stdout } = await execFileAsync('npm', ['view', name, 'version'], {
+      timeout: 20000,
+      env,
+      maxBuffer: 64 * 1024,
+    });
+    return String(stdout || '').trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+export async function runUpdate(argv = [], options = {}) {
+  const write = options.write || ((s) => process.stdout.write(s));
+  const env = options.env || process.env;
+  const json = argv.includes('--json');
+  const apply = argv.includes('--apply') || argv.includes('-y');
+
+  const current = pkg.version;
+  const available = await latestNpmVersion('@inneranimalmedia/agentsam-sdk', env);
+
+  const payload = {
+    schema_version: 'agentsam-update-v1',
+    current: {
+      sdk: current,
+      package: '@inneranimalmedia/agentsam-sdk',
+    },
+    available: {
+      sdk: available,
+    },
+    changes: available && available !== current
+      ? [
+          { component: 'AgentSam CLI / SDK', from: current, to: available },
+        ]
+      : [],
+    breaking_changes: [],
+    migration: [],
+    native_notes: [
+      'If npm warns about allow-scripts for node-pty/protobufjs:',
+      '  npm config set allow-scripts=node-pty,protobufjs --location=user',
+      '  npm rebuild node-pty protobufjs',
+    ],
+    installer_note:
+      '/install/studio currently installs the SDK CLI globally; signed Local Studio .app install is a separate graduation ticket.',
+  };
+
+  if (json) {
+    write(JSON.stringify(payload, null, 2) + '\n');
+    return 0;
+  }
+
+  writeLine(write, '');
+  writeLine(write, '  Agent Sam update');
+  writeLine(write, '');
+  writeLine(write, '  Current');
+  writeLine(write, `    SDK             ${current}`);
+  writeLine(write, '');
+  writeLine(write, '  Available');
+  writeLine(write, `    SDK             ${available || '(could not query npm registry)'}`);
+  writeLine(write, '');
+
+  if (!available) {
+    writeLine(write, '  ✕ Could not determine latest version. Check network / npm auth.');
+    writeLine(write, '');
+    return 1;
+  }
+
+  if (available === current) {
+    writeLine(write, '  ✓ Already on the latest published SDK.');
+    writeLine(write, '');
+    writeLine(write, '  Notes');
+    for (const note of payload.native_notes) writeLine(write, `    ${note}`);
+    writeLine(write, `    ${payload.installer_note}`);
+    writeLine(write, '');
+    return 0;
+  }
+
+  writeLine(write, '  Changes');
+  for (const row of payload.changes) {
+    writeLine(write, `    ${row.component.padEnd(28)} ${row.from} → ${row.to}`);
+  }
+  writeLine(write, '');
+  writeLine(write, '  Breaking changes');
+  writeLine(write, '    none reported by this preview (read release notes before applying)');
+  writeLine(write, '');
+  writeLine(write, '  Native dependency tip');
+  for (const note of payload.native_notes) writeLine(write, `    ${note}`);
+  writeLine(write, '');
+  writeLine(write, '  Installer note');
+  writeLine(write, `    ${payload.installer_note}`);
+  writeLine(write, '');
+
+  if (!apply) {
+    writeLine(write, '  [enter] not auto-run from non-interactive CLI');
+    writeLine(write, '  Apply with:');
+    writeLine(write, '    npm install -g @inneranimalmedia/agentsam-sdk@latest');
+    writeLine(write, '    agentsam update --apply   # prints the same npm command guidance');
+    writeLine(write, '');
+    return 0;
+  }
+
+  writeLine(write, '  Applying via npm (global)…');
+  try {
+    const { stdout, stderr } = await execFileAsync(
+      'npm',
+      ['install', '-g', `@inneranimalmedia/agentsam-sdk@${available}`],
+      { timeout: 300000, env, maxBuffer: 4 * 1024 * 1024 },
+    );
+    if (stdout) write(stdout.endsWith('\n') ? stdout : `${stdout}\n`);
+    if (stderr) write(stderr.endsWith('\n') ? stderr : `${stderr}\n`);
+    writeLine(write, '');
+    writeLine(write, '  Verifying…');
+    writeLine(write, '    ✓ package install attempted');
+    writeLine(write, '    → run: agentsam --version && agentsam status');
+    writeLine(write, '    → if PTY scripts were blocked:');
+    writeLine(write, '         npm config set allow-scripts=node-pty,protobufjs --location=user');
+    writeLine(write, '         npm rebuild node-pty protobufjs');
+    writeLine(write, '');
+    return 0;
+  } catch (error) {
+    write(String(error?.stderr || error?.message || error));
+    writeLine(write, '');
+    writeLine(write, '  ✕ Update failed. No silent fallback.');
+    return 1;
+  }
+}