@notis_ai/cli 0.2.0-beta.16.1 → 0.2.0-beta.160.1

package/src/runtime/transport.js

@@ -1,34 +1,88 @@
 import { randomUUID } from 'node:crypto';
+import { createReadStream } from 'node:fs';
+import { dirname } from 'node:path';
 import { CliError, EXIT_CODES } from './errors.js';
+import { delegatedContextReason } from './delegated-context.js';
+import {
+  credentialIsExpired,
+  getJwtExpiration,
+  getJwtSubject,
+  getProfile,
+  isJwtExpired,
+  loadConfig,
+  resolveWorktreeRuntime,
+} from './profiles.js';
+import { createExpiredAuthError, createInvalidAuthHints } from './auth-recovery.js';
+import { refreshOAuthCredential } from './oauth.js';
 
-const META_TOOL_NAMES = new Set([
-  'notis_find_toolkits',
-  'notis_find_tools',
-  'notis_execute_tool',
-  'notis_find_additional_tools',
-]);
+function escapeMultipartHeaderValue(value) {
+  return String(value ?? '')
+    .replace(/"/g, '%22')
+    .replace(/\r/g, '%0D')
+    .replace(/\n/g, '%0A');
+}
 
-function canonicalizeToolName(toolName) {
-  if (typeof toolName !== 'string' || !toolName.length) {
-    return toolName;
-  }
+function multipartTextPart(boundary, name, value) {
+  return [
+    `--${boundary}`,
+    `Content-Disposition: form-data; name="${escapeMultipartHeaderValue(name)}"`,
+    '',
+    value,
+    '',
+  ].join('\r\n');
+}
 
-  if (META_TOOL_NAMES.has(toolName) || toolName.startsWith('notis-default-')) {
-    return toolName;
-  }
+function multipartFileHeader(boundary, binding) {
+  const filename = escapeMultipartHeaderValue(binding.basename || binding.field_name);
+  return [
+    `--${boundary}`,
+    `Content-Disposition: form-data; name="${escapeMultipartHeaderValue(binding.field_name)}"; filename="${filename}"`,
+    `Content-Type: ${binding.contentType || 'application/octet-stream'}`,
+    '',
+    '',
+  ].join('\r\n');
+}
 
-  if (toolName.startsWith('notis_')) {
-    return `notis-default-${toolName.slice('notis_'.length)}`;
+async function* multipartFileBody(boundary, payload, bindingMetadata, fileBindings) {
+  yield Buffer.from(multipartTextPart(boundary, 'payload', JSON.stringify(payload)));
+  yield Buffer.from(multipartTextPart(boundary, 'file_bindings', JSON.stringify(bindingMetadata)));
+  for (const binding of fileBindings) {
+    yield Buffer.from(multipartFileHeader(boundary, binding));
+    for await (const chunk of createReadStream(binding.localPath)) {
+      yield chunk;
+    }
+    yield Buffer.from('\r\n');
   }
+  yield Buffer.from(`--${boundary}--\r\n`);
+}
 
-  if (toolName.includes('_notis_')) {
-    return `notis-default-${toolName.replace(/_notis_/g, '_')}`;
-  }
+function createMultipartFileUpload(payload, bindingMetadata, fileBindings) {
+  const boundary = `----notis-cli-${randomUUID().replace(/-/g, '')}`;
+  const textParts = [
+    multipartTextPart(boundary, 'payload', JSON.stringify(payload)),
+    multipartTextPart(boundary, 'file_bindings', JSON.stringify(bindingMetadata)),
+  ];
+  const fileHeaderParts = fileBindings.map((binding) => multipartFileHeader(boundary, binding));
+  const closingPart = `--${boundary}--\r\n`;
+  const contentLength = [
+    ...textParts,
+    ...fileHeaderParts,
+    ...fileBindings.map(() => '\r\n'),
+    closingPart,
+  ].reduce((total, part) => total + Buffer.byteLength(part), 0)
+    + fileBindings.reduce((total, binding) => total + binding.size, 0);
 
-  return toolName;
+  return {
+    body: multipartFileBody(boundary, payload, bindingMetadata, fileBindings),
+    headers: {
+      'Content-Type': `multipart/form-data; boundary=${boundary}`,
+      'Content-Length': String(contentLength),
+    },
+    duplex: 'half',
+  };
 }
 
-function normalizeBackendError(status, payload) {
+function normalizeBackendError(status, payload, runtime) {
   const backendError = payload?.error;
   const message =
     backendError?.message ||
@@ -43,10 +97,7 @@ function normalizeBackendError(status, payload) {
       message,
       exitCode: EXIT_CODES.auth,
       hints: [
-        {
-          command: 'notis auth login --jwt <token>',
-          reason: 'Refresh the stored JWT for this profile',
-        },
+        ...createInvalidAuthHints(runtime),
       ],
       details: payload || {},
     });
@@ -77,6 +128,18 @@ function normalizeBackendError(status, payload) {
     });
   }
 
+  if (status === 402) {
+    // Distinct from auth on purpose: an agent that sees an auth exit code will
+    // loop trying to re-authenticate, when the actual fix is to add credit.
+    return new CliError({
+      code: 'payment_required',
+      message,
+      exitCode: EXIT_CODES.payment,
+      details: payload || {},
+      hints: payload?.hints || [],
+    });
+  }
+
   if (status >= 400 && status < 500) {
     return new CliError({
       code: 'usage_error',
@@ -97,45 +160,233 @@ function normalizeBackendError(status, payload) {
   });
 }
 
+/**
+ * Pick up a dev credential that `./dev.sh` re-minted mid-process.
+ *
+ * Restarting the local runtime rewrites the worktree lease in place, so a
+ * long-running command can recover from a single 401 instead of failing and
+ * making the caller rerun it. The refreshed token still has to belong to the
+ * worktree's approved test user.
+ */
+function reloadDevJwt(runtime, loadedProfile = null) {
+  if (runtime.credentialKind !== 'worktree') {
+    return false;
+  }
+  let nextJwt = null;
+  const expectedUserId = runtime.worktreeRuntime?.expected_user_id;
+  const runtimePath = runtime.worktreeRuntime?.runtime_path;
+  if (runtimePath) {
+    const refreshedRuntime = resolveWorktreeRuntime(dirname(runtimePath));
+    if (
+      refreshedRuntime
+      && !refreshedRuntime.unavailable
+      && refreshedRuntime.runtime_path === runtimePath
+      && refreshedRuntime.profile === runtime.profileName
+      && refreshedRuntime.api_base === runtime.apiBase
+    ) {
+      if (
+        expectedUserId
+        && refreshedRuntime.expected_user_id !== expectedUserId
+      ) {
+        throw new CliError({
+          code: 'dev_runtime_identity_mismatch',
+          message: 'The restarted worktree runtime belongs to a different test user',
+          exitCode: EXIT_CODES.auth,
+          hints: [
+            { message: 'Restart this CLI command under the worktree\'s current dev identity.' },
+            { message: `Expected user: ${expectedUserId}` },
+          ],
+        });
+      }
+      runtime.worktreeRuntime = refreshedRuntime;
+      nextJwt = refreshedRuntime.dev_access_token;
+    }
+  }
+  let profile = loadedProfile;
+  if (!nextJwt && !profile) {
+    try {
+      profile = getProfile(loadConfig(), runtime.profileName);
+    } catch {
+      return false;
+    }
+  }
+  nextJwt = nextJwt || (
+    typeof profile?.dev_access_token === 'string' && profile.dev_access_token
+      ? profile.dev_access_token
+      : null
+  );
+  if (!nextJwt || nextJwt === runtime.jwt) {
+    return false;
+  }
+  if (expectedUserId && getJwtSubject(nextJwt) !== expectedUserId) {
+    throw new CliError({
+      code: 'dev_runtime_identity_mismatch',
+      message: 'The refreshed dev credential does not belong to this worktree test user',
+      exitCode: EXIT_CODES.auth,
+      hints: [
+        { message: 'Restart ./dev.sh to restore the approved worktree identity.' },
+        { message: `Expected user: ${expectedUserId}` },
+      ],
+    });
+  }
+  runtime.jwt = nextJwt;
+  return true;
+}
+
+/**
+ * A live worktree lease is authoritative over any stale dev metadata left in
+ * the shared profile store. Prefer its explicit expiry, then the active JWT's
+ * expiry, and deliberately fail closed when neither can be verified.
+ */
+export function getActiveWorktreeCredentialProfile(runtime, loadedProfile = {}) {
+  if (runtime.credentialKind !== 'worktree') {
+    return loadedProfile;
+  }
+  return {
+    ...loadedProfile,
+    dev_access_expires_at:
+      runtime.worktreeRuntime?.dev_access_expires_at
+      ?? getJwtExpiration(runtime.jwt)
+      ?? loadedProfile.dev_access_expires_at,
+  };
+}
+
 export async function httpRequest({
   runtime,
   method = 'POST',
   path,
   body,
+  multipart = false,
   requireAuth = true,
 }) {
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), runtime.timeoutMs);
+  // Refresh before spending the credential rather than after a rejection: the
+  // rotating refresh token is shared with every other `notis` process reading
+  // the same profile, so a lapsed access token is renewed once, under the
+  // config write lock, instead of racing on a 401 retry.
+  let currentProfile;
+  if (runtime.credentialKind === 'oauth') {
+    if (requireAuth && credentialIsExpired(runtime, {
+      oauth_access_expires_at: runtime.oauthAccessExpiresAt,
+    })) {
+      await refreshOAuthCredential(runtime);
+    }
+    currentProfile = getProfile(loadConfig(), runtime.profileName);
+  } else {
+    currentProfile = getProfile(loadConfig(), runtime.profileName);
+    reloadDevJwt(runtime, currentProfile);
+    currentProfile = getActiveWorktreeCredentialProfile(runtime, currentProfile);
+  }
+  if (requireAuth && credentialIsExpired(runtime, currentProfile)) {
+    throw createExpiredAuthError(runtime);
+  }
+
+  let controller = new AbortController();
+  let timeout = setTimeout(() => controller.abort(), runtime.timeoutMs);
   const requestId = `req_${randomUUID().replace(/-/g, '')}`;
+  const resetTimeout = () => {
+    clearTimeout(timeout);
+    controller = new AbortController();
+    timeout = setTimeout(() => controller.abort(), runtime.timeoutMs);
+  };
 
   const headers = {
-    'Content-Type': 'application/json',
     'X-Notis-CLI-Version': runtime.cliVersion,
     'X-Notis-Request-Id': requestId,
   };
+  if (!multipart) {
+    headers['Content-Type'] = 'application/json';
+  }
 
   if (requireAuth && runtime.jwt) {
     headers.Authorization = `Bearer ${runtime.jwt}`;
   }
 
+  const resolveBody = () => {
+    if (!multipart) {
+      return {
+        body: body ? JSON.stringify(body) : undefined,
+        headers: {},
+      };
+    }
+    if (typeof body === 'function') {
+      return body();
+    }
+    return {
+      body,
+      headers: {},
+    };
+  };
+
   try {
-    const response = await fetch(`${runtime.apiBase}${path}`, {
+    let requestBody = resolveBody();
+    let response = await fetch(`${runtime.apiBase}${path}`, {
       method,
-      headers,
-      body: body ? JSON.stringify(body) : undefined,
+      headers: { ...headers, ...requestBody.headers },
+      body: requestBody.body,
       signal: controller.signal,
+      ...(requestBody.duplex ? { duplex: requestBody.duplex } : {}),
     });
-    clearTimeout(timeout);
 
     let payload = null;
+    let payloadReadError = null;
     try {
       payload = await response.json();
-    } catch {
+    } catch (error) {
+      payloadReadError = error;
       payload = null;
     }
 
+    if (response.status === 401) {
+      const refreshed = runtime.credentialKind === 'oauth'
+        ? await refreshOAuthCredential(runtime)
+        : reloadDevJwt(runtime) && !isJwtExpired(runtime.jwt);
+      if (refreshed) {
+        if (requireAuth && runtime.jwt) {
+          headers.Authorization = `Bearer ${runtime.jwt}`;
+        }
+        resetTimeout();
+        requestBody = resolveBody();
+        response = await fetch(`${runtime.apiBase}${path}`, {
+          method,
+          headers: { ...headers, ...requestBody.headers },
+          body: requestBody.body,
+          signal: controller.signal,
+          ...(requestBody.duplex ? { duplex: requestBody.duplex } : {}),
+        });
+        payloadReadError = null;
+        try {
+          payload = await response.json();
+        } catch (error) {
+          payloadReadError = error;
+          payload = null;
+        }
+      }
+    }
+
+    clearTimeout(timeout);
+
     if (!response.ok) {
-      throw normalizeBackendError(response.status, payload);
+      if (
+        response.status === 401
+        && credentialIsExpired(
+          runtime,
+          getActiveWorktreeCredentialProfile(
+            runtime,
+            getProfile(loadConfig(), runtime.profileName),
+          ),
+        )
+      ) {
+        throw createExpiredAuthError(runtime);
+      }
+      throw normalizeBackendError(response.status, payload, runtime);
+    }
+
+    // A successful status is not a successful tool call until its response
+    // body has been read. Mutations may already have committed before a socket
+    // reset truncates the JSON; surface that as an ambiguous network failure
+    // so callers never persist an undefined result or attempt a second write.
+    if (response.status !== 204 && payloadReadError) {
+      throw payloadReadError;
     }
 
     return {
@@ -177,22 +428,50 @@ export async function callTool({
   toolName,
   arguments_: argumentsPayload = {},
   idempotencyKey,
+  fileBindings = [],
 }) {
   const requestId = idempotencyKey || (runtime.mutating ? randomUUID() : null);
+  const payload = {
+    tool_name: toolName,
+    arguments: argumentsPayload,
+    idempotency_key: requestId,
+    cli_context: {
+      output_mode: runtime.outputMode,
+      profile: runtime.profileName,
+      cwd: process.cwd(),
+      agent_mode: runtime.agentMode,
+      cli_version: runtime.cliVersion,
+      // Reported so the server can refuse work-handing tools from a run Notis
+      // is itself driving. Advisory -- a determined agent can unset the markers
+      // -- so the server treats it as one layer, not the whole guard.
+      ...(delegatedContextReason() ? { delegated_context: true } : {}),
+      ...(runtime.debugEntitlementOverride
+        ? { debug_entitlement_override: runtime.debugEntitlementOverride }
+        : {}),
+    },
+  };
+
+  if (Array.isArray(fileBindings) && fileBindings.length) {
+    const bindingMetadata = fileBindings.map((binding) => {
+      const {
+        contentType,
+        localPath,
+        ...metadata
+      } = binding;
+      return metadata;
+    });
+
+    return httpRequest({
+      runtime,
+      path: '/cli_tools',
+      body: () => createMultipartFileUpload(payload, bindingMetadata, fileBindings),
+      multipart: true,
+    });
+  }
+
   return httpRequest({
     runtime,
     path: '/cli_tools',
-    body: {
-      tool_name: canonicalizeToolName(toolName),
-      arguments: argumentsPayload,
-      idempotency_key: requestId,
-      cli_context: {
-        output_mode: runtime.outputMode,
-        profile: runtime.profileName,
-        cwd: process.cwd(),
-        agent_mode: runtime.agentMode,
-        cli_version: runtime.cliVersion,
-      },
-    },
+    body: payload,
   });
 }

package/src/skill-sync-worker-entry.js

@@ -0,0 +1,2 @@
+import { main } from './skill-sync-worker.js';
+await main();

package/src/skill-sync-worker.js

@@ -0,0 +1,50 @@
+import { mkdirSync, renameSync, writeFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { resolveRuntimeProfile } from './runtime/profiles.js';
+import { ensureFreshOAuthCredential } from './runtime/oauth.js';
+import { runSkillSync, fetchSyncSettings } from '../dist/skill-sync/index.js';
+import { withSkillSyncLock } from './runtime/sync-skills.js';
+
+export async function runAutomaticSkillSync({ profile, apiBase, userId }, {
+  resolveRuntime = resolveRuntimeProfile, refresh = ensureFreshOAuthCredential,
+  settings = fetchSyncSettings, sync = runSkillSync, lock = withSkillSyncLock,
+} = {}) {
+  const runtime = resolveRuntime({ profile }, { requireAuth: true });
+  if (runtime.credentialKind !== 'oauth' || runtime.apiBase !== apiBase
+    || runtime.oauthUserId !== userId) throw new Error('Automatic skill sync account changed; run notis skills sync to rebind');
+  await refresh(runtime);
+  const saved = await settings(runtime.apiBase, runtime.jwt);
+  if (saved.user_id !== userId) throw new Error('Automatic skill sync identity mismatch');
+  // Do not gather, unlink foreign accounts or write anything when opted out.
+  if (!saved.sync_enabled) return { status: 'disabled' };
+  const result = await lock(() => sync(runtime.apiBase, runtime.jwt, {
+    fetchSyncSettings: async () => saved,
+  }, { honorSyncEnabled: true }));
+  return { status: (result.failedLinks?.length || result.failedPushes?.length) ? 'partial' : 'synced', ...result };
+}
+
+export async function main(args = process.argv.slice(2)) {
+  const [profile, apiBase, userId] = args;
+  const root = join(homedir(), '.notis', 'skills', 'service');
+  const record = (value) => {
+    mkdirSync(root, { recursive: true, mode: 0o700 });
+    const target = join(root, 'status.json');
+    const temporary = `${target}.${process.pid}.tmp`;
+    writeFileSync(temporary, JSON.stringify({ ...value, profile, at: new Date().toISOString() }, null, 2), { mode: 0o600 });
+    renameSync(temporary, target);
+  };
+  const deadline = setTimeout(() => {
+    record({ status: 'error', code: 'sync_timeout' });
+    process.exit(1);
+  }, 240_000);
+  try {
+    record(await runAutomaticSkillSync({ profile, apiBase, userId }));
+  } catch (error) {
+    // Persist only a classified error, never a bearer, signed URL or response body.
+    record({ status: 'error', code: error.code || 'sync_failed' });
+    process.exitCode = 1;
+  } finally {
+    clearTimeout(deadline);
+  }
+}