@openclaw-cloud/agent-controller 3.0.0-beta.2 → 3.0.0-beta.20

package/dist/utils/anthropic-auth.js

@@ -10,4 +10,28 @@ export function classifyAnthropicAuth(input) {
         return { kind: 'auth_token', value: apiKey };
     return { kind: 'api_key', value: apiKey };
 }
+/** The permissions block both Claude settings writers emit, verbatim. */
+export const CLAUDE_PERMISSIONS = {
+    allow: ['Bash(*)', 'Read(*)', 'Write(*)', 'Edit(*)', 'mcp__*'],
+};
+/**
+ * The settings.json base shared by both writers: the permissions block plus the
+ * `env` entry the auth classification implies.
+ *
+ * `providers/claude-code/settings-writer.ts` uses this as its complete output;
+ * `utils/claude-env.ts` uses it for the OAuth branch and composes its own
+ * apiKeyHelper variant for the API-key branch (that flow reads the key out of
+ * the VM `.env` at runtime instead of embedding it).
+ */
+export function buildClaudeSettings(auth) {
+    switch (auth.kind) {
+        case 'auth_token':
+            return { permissions: CLAUDE_PERMISSIONS, env: { ANTHROPIC_AUTH_TOKEN: auth.value } };
+        case 'api_key':
+            return { permissions: CLAUDE_PERMISSIONS, env: { ANTHROPIC_API_KEY: auth.value } };
+        case 'none':
+            // No static credentials: rely on ~/.claude/.credentials.json (subscription login).
+            return { permissions: CLAUDE_PERMISSIONS };
+    }
+}
 //# sourceMappingURL=anthropic-auth.js.map

package/dist/utils/anthropic-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-auth.js","sourceRoot":"","sources":["../../src/utils/anthropic-auth.ts"],"names":[],"mappings":"AAiBA,MAAM,UAAU,qBAAqB,CAAC,KAGrC;IACC,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC;IACnD,IAAI,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAE/D,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;IAC7C,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAErC,yEAAyE;IACzE,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAElF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"anthropic-auth.js","sourceRoot":"","sources":["../../src/utils/anthropic-auth.ts"],"names":[],"mappings":"AAiBA,MAAM,UAAU,qBAAqB,CAAC,KAGrC;IACC,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC;IACnD,IAAI,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAE/D,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;IAC7C,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAErC,yEAAyE;IACzE,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAElF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAC5C,CAAC;AAED,yEAAyE;AACzE,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC;CAC/D,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAmB;IACrD,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,YAAY;YACf,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,EAAE,EAAE,oBAAoB,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;QACxF,KAAK,SAAS;YACZ,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,EAAE,EAAE,iBAAiB,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;QACrF,KAAK,MAAM;YACT,mFAAmF;YACnF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;IAC/C,CAAC;AACH,CAAC"}

package/dist/utils/apply-config.d.ts

@@ -1,14 +1,29 @@
-import type { BootstrapResult } from '../api.js';
+import type { AgentApi, BootstrapResult } from '../api.js';
+/** Canonical openclaw.json location — `<stateDir>/openclaw.json`. */
+export declare function getOpenclawJsonPath(): string;
 /**
- * Apply config from bootstrap API response:
+ * The ONE writer for openclaw.json — atomic (tmp + rename) and mode 0600.
+ *
+ * Both properties are load-bearing and used to be split across three
+ * independent write sites: the full apply wrote 0600 but non-atomically (a
+ * reader could see a truncated file), the scoped merge wrote atomically but
+ * with no mode (tmp + rename RESETS a pre-existing 0600 file to 0644, leaking
+ * `models.providers[*].apiKey`), and the startup memory-MCP injection did
+ * neither. Everything goes through here now.
+ */
+export declare function writeOpenclawJson(data: Record<string, unknown>): Promise<void>;
+/**
+ * FULL apply — only ever legal on a managed install (see `isManagedDeploy`).
+ * Rewrites files wholesale:
  * 1. Write openclaw.json
- * 2. Write auth-profiles.json + settings.json (from envVars)
- * 3. Write .env (for VM agents)
- * 4. Restart gateway
+ * 2. Write workspace files + skills
+ * 3. Write auth-profiles.json + settings.json (from envVars)
+ * 4. MERGE .env (for VM agents) — never a wholesale replace, see step 4 below
+ * 5. Restart gateway
  */
 export declare function applyBootstrapConfig(data: BootstrapResult): Promise<void>;
-type MergeOutcome = 'added' | 'equal' | 'conflict' | 'merged';
-interface MergeResult {
+type MergeOutcome = 'added' | 'equal' | 'conflict' | 'merged' | 'overwritten';
+export interface MergeResult {
     changed: boolean;
     outcomes: Array<{
         path: string;
@@ -26,12 +41,50 @@ interface MergeResult {
  *  - Missing local value → remote is written.
  *  - Equal values → no-op.
  *  - Differing values → conflict, local wins, warn+skip logged.
- *  - For `mcp.servers` (and other object paths): conflict detection is
- *    per-key inside the dict.
- *  - Does NOT restart the gateway (standalone owns their own lifecycle).
- *  - Settings.json (~/.claude/settings.json) gets the same treatment for
- *    `mcp.servers` and `env` only — apiKeyHelper/permissions/etc untouched.
+ *  - For object paths: conflict detection is per-key inside the dict.
+ *  - **Exception — `mcp.servers` in openclaw.json is REMOTE-wins per key.**
+ *    That section is backend-managed: the URL, transport and bearer token of a
+ *    backend-generated server (e.g. `openclaw-cloud`) change over time, and
+ *    under local-wins an updated entry could never reach a standalone agent —
+ *    a rotated token was skipped forever (observed live 2026-08-02). Every
+ *    server NAME present in the payload is overwritten; names that exist only
+ *    locally are left untouched.
+ *    LIMITATION — no deletions. A server removed in the backend stays in the
+ *    local openclaw.json: the payload cannot distinguish "removed upstream"
+ *    from "never managed here", and dropping local-only entries would delete
+ *    the user's own servers. Removal on standalone is a manual edit.
+ *  - Restarts the gateway **iff** the `mcp.servers` subtree actually changed.
+ *    This is a FALLBACK, not the primary delivery mechanism: openclaw 2026.7.1
+ *    does self-reload this section (verified live 2026-08-03 — the gateway
+ *    logged `[reload] config hot reload applied (mcp.servers.<name>.url,
+ *    mcp.servers.<name>.headers)` on an overwrite, with no restart). The
+ *    restart covers builds/paths where that self-reload does not fire, and
+ *    mirrors what applyBootstrapConfig does on managed installs. It is
+ *    best-effort: a failure is logged and does not fail the apply — on a
+ *    launchd box where `openclaw` is not on the service PATH it never runs at
+ *    all, and the merge still lands.
+ *  - Settings.json (~/.claude/settings.json) keeps LOCAL-wins for
+ *    `mcp.servers` ONLY — apiKeyHelper/permissions/env/etc untouched. `env` is
+ *    never written here: it would redirect the user's own Claude Code sessions
+ *    to the platform proxy (see MERGEABLE_SETTINGS_PATHS).
  *  - auth-profiles.json and .env are NOT touched on standalone.
  */
 export declare function applyMergeableConfig(data: BootstrapResult): Promise<MergeResult>;
+export interface ApplyConfigOutcome {
+    /** True when the full apply ran (managed install), false for scoped merge. */
+    managed: boolean;
+    /** Present only on the scoped-merge path. */
+    mergeResult?: MergeResult;
+}
+/**
+ * The one owner of "fetch bootstrap and apply it". Every caller — the
+ * `update_config` WS handler, the `bootstrap` CLI, the opt-in startup refresh —
+ * goes through here so the deploy-type decision cannot drift between them.
+ *
+ * Managed installs ('vm'/'k8s') are provisioned end to end by the platform and
+ * get the full apply. Anything else — 'standalone', 'external', or a payload
+ * from an older backend that omits `deploymentType` — is a third-party machine
+ * and gets the scoped, additive merge only. Never rewrite files we don't own.
+ */
+export declare function fetchAndApplyConfig(api: AgentApi, agentId: string): Promise<ApplyConfigOutcome>;
 export {};