@a1hvdy/cc-openclaw 0.7.1 → 0.9.0

package/dist/src/types/upstream.js

@@ -0,0 +1,145 @@
+/**
+ * Cluster A — Upstream config schemas.
+ *
+ * Validates files that cc-openclaw reads from outside its own tree:
+ *   - `~/.openclaw/openclaw.json`           (gateway config)
+ *   - `<plugin-root>/openclaw.plugin.json`  (plugin manifest)
+ *
+ * Schemas are intentionally LOOSE (`.passthrough()`) — cc-openclaw only
+ * cares about a handful of fields (plugins.allow, agents.list[id=main]
+ * primary model). Future fields openclaw upstream adds should not break
+ * the parse. Cluster C's `validate-upstream` phase will use these
+ * schemas as part of `expectedShape` checks for declared patches.
+ *
+ * NOT consumed yet — Cluster A first commit establishes the vocabulary.
+ * Cluster A step 5 (per PRP §14) threads `OpenClawConfigSchema` into the
+ * `cwd-patch.ts:903` model-guard reader.
+ */
+import { z } from 'zod';
+// ── ~/.openclaw/openclaw.json ────────────────────────────────────────────────
+// `model` accepts two shapes per cwd-patch.ts:922-923:
+//   - bare string: `"cc-openclaw/claude-opus-4-7"`
+//   - structured:  `{ primary: "...", fallback?: ... }`
+// Both are real shapes seen in the wild.
+const AgentModelObjSchema = z
+    .object({
+    primary: z.string().optional(),
+    fallback: z.union([z.string(), z.array(z.string())]).optional(),
+})
+    .passthrough();
+const AgentModelSchema = z.union([z.string(), AgentModelObjSchema]);
+const AgentEntrySchema = z
+    .object({
+    id: z.string(),
+    model: AgentModelSchema.optional(),
+})
+    .passthrough();
+const AgentsContainerSchema = z
+    .object({
+    list: z.array(AgentEntrySchema).optional(),
+    defaults: z.record(z.unknown()).optional(),
+})
+    .passthrough();
+// `agents` accepts two shapes in the wild:
+//   1. Canonical (current openclaw): `agents: { list: [...], defaults: {...} }`
+//   2. Legacy (older configs): `agents: [...]` — bare array
+// The model-guard reader at cwd-patch.ts already handles both; the schema
+// must accept both too or boot fails on legacy configs.
+const AgentsBlockSchema = z.union([z.array(AgentEntrySchema), AgentsContainerSchema]);
+export const OpenClawConfigSchema = z
+    .object({
+    plugins: z
+        .object({
+        allow: z.array(z.string()).optional(),
+        deny: z.array(z.string()).optional(),
+    })
+        .passthrough()
+        .optional(),
+    agents: AgentsBlockSchema.optional(),
+    channels: z.record(z.unknown()).optional(),
+    commands: z.record(z.unknown()).optional(),
+})
+    .passthrough();
+// ── openclaw.plugin.json (this plugin's own manifest) ────────────────────────
+export const PluginManifestSchema = z
+    .object({
+    id: z.literal('cc-openclaw'),
+    enabledByDefault: z.boolean().optional(),
+    activation: z
+        .object({
+        onStartup: z.boolean().optional(),
+    })
+        .passthrough()
+        .optional(),
+    configSchema: z.record(z.unknown()).optional(),
+    capabilities: z
+        .object({
+        childProcess: z.boolean().optional(),
+        networkAccess: z.array(z.string()).optional(),
+    })
+        .passthrough()
+        .optional(),
+})
+    .passthrough();
+/**
+ * Extract the agent list from either of the two `agents` shapes:
+ *   - direct array (legacy): `agents: [...]`
+ *   - container (canonical): `agents: { list: [...] }`
+ * Returns `[]` when neither shape applies.
+ */
+export function getAgentList(cfg) {
+    const a = cfg.agents;
+    if (!a)
+        return [];
+    if (Array.isArray(a))
+        return a;
+    return a.list ?? [];
+}
+/**
+ * Read the `agents.defaults.model.primary` (or top-level string) from an
+ * OpenClaw config, normalizing the same two shapes `model` may take:
+ *   - string                                      → returned as-is
+ *   - { primary, fallback?, ... }                  → returned `.primary`
+ */
+export function getDefaultsPrimaryModel(cfg) {
+    const a = cfg.agents;
+    if (!a || Array.isArray(a))
+        return undefined;
+    const m = a.defaults && a.defaults.model;
+    if (typeof m === 'string')
+        return m;
+    if (m && typeof m === 'object' && 'primary' in m) {
+        const primary = m.primary;
+        return typeof primary === 'string' ? primary : undefined;
+    }
+    return undefined;
+}
+/**
+ * Find the `main` agent entry. Returns `undefined` when no entry has
+ * `id === 'main'` or when neither agents-shape is present.
+ * Used by the model-guard at `cwd-patch.ts:903-941`.
+ */
+export function findMainAgent(cfg) {
+    return getAgentList(cfg).find((a) => a.id === 'main');
+}
+/**
+ * Read the primary model string for an agent entry. Mirrors the logic at
+ * cwd-patch.ts:922-923: `model` may be a bare string OR `{primary, …}`.
+ */
+export function getAgentPrimaryModel(agent) {
+    if (!agent)
+        return undefined;
+    const m = agent.model;
+    if (!m)
+        return undefined;
+    if (typeof m === 'string')
+        return m;
+    return m.primary;
+}
+/** Predicate for the model-guard warning at `cwd-patch.ts:903-941`. */
+export function isClaudeRoutedModel(model) {
+    if (!model)
+        return false;
+    return model.startsWith('claude-local/') || model.startsWith('cc-openclaw/');
+}
+//# sourceMappingURL=upstream.js.map

package/dist/src/types/upstream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upstream.js","sourceRoot":"","sources":["../../../src/types/upstream.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a1hvdy/cc-openclaw",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "description": "A1xAI's Anthropic CLI bridge plugin for OpenClaw",
   "author": "@a1cy",
   "license": "MIT",
@@ -46,7 +46,8 @@
     "prepublishOnly": "npm run build && npm test"
   },
   "dependencies": {
-    "commander": "^12.1.0"
+    "commander": "^12.1.0",
+    "zod": "^3.23.0"
   },
   "peerDependencies": {
     "openclaw": ">=2026.3.0"

package/dist/src/lib/route-flag.d.ts

@@ -1,49 +0,0 @@
-/**
- * Route flag — selects which engine handles new sessions.
- *
- * Primary env var (per PRP_v3 §10):
- *   `OPENCLAW_CC_OPENCLAW_ACTIVE=1` → 'cc-openclaw'
- *   `OPENCLAW_CC_OPENCLAW_ACTIVE=0` (or unset) → 'claude-local'
- *
- * Deprecated alias (maintained for one minor version):
- *   `OPENCLAW_USE_CC_OPENCLAW` — read iff ACTIVE name is unset.
- *   Will be removed in v0.2.0.
- *
- * Each call to selectEngine() observes the env AT CALL TIME — no caching.
- * This satisfies PRP backward-compat contract #4: env-flag rollback works
- * in both directions within session boundary, no restart needed.
- *
- * In-flight sessions stay on their original engine — that's a gateway-level
- * property (each session captures its engine at session start). This module
- * only decides routing for NEW session starts.
- *
- * Default 'claude-local' during the parallel period (P0–P5). Cutover at P6
- * flips the default by setting OPENCLAW_CC_OPENCLAW_ACTIVE=1 in the runtime env.
- */
-export type Engine = 'cc-openclaw' | 'claude-local';
-/** Primary env var name (PRP_v3 §10). */
-export declare const ACTIVE_FLAG_ENV = "OPENCLAW_CC_OPENCLAW_ACTIVE";
-/**
- * @deprecated Use `ACTIVE_FLAG_ENV`. Read for one minor version as a
- * fallback when the new name is unset. Removed in v0.2.0.
- */
-export declare const ROUTE_FLAG_ENV = "OPENCLAW_USE_CC_OPENCLAW";
-/**
- * Read env at call time. Prefers `OPENCLAW_CC_OPENCLAW_ACTIVE`; falls back to
- * deprecated `OPENCLAW_USE_CC_OPENCLAW` only when the new name is unset.
- * Returns true when value is '1', 'true', or 'on' (case-insensitive).
- */
-export declare function isCcOpenclawEnabled(): boolean;
-/** Select the engine for a new session. Default 'claude-local'. */
-export declare function selectEngine(): Engine;
-/**
- * Capture the engine for a session at start time. Returns a frozen snapshot —
- * subsequent calls to its current() method always return the captured value
- * even if env later changes. This is what makes "in-flight sessions stay on
- * original engine" architecturally true at the route-flag layer.
- */
-export interface SessionRoute {
-    readonly engine: Engine;
-    readonly capturedAt: string;
-}
-export declare function captureSessionRoute(): SessionRoute;

package/dist/src/lib/route-flag.js

@@ -1,52 +0,0 @@
-/**
- * Route flag — selects which engine handles new sessions.
- *
- * Primary env var (per PRP_v3 §10):
- *   `OPENCLAW_CC_OPENCLAW_ACTIVE=1` → 'cc-openclaw'
- *   `OPENCLAW_CC_OPENCLAW_ACTIVE=0` (or unset) → 'claude-local'
- *
- * Deprecated alias (maintained for one minor version):
- *   `OPENCLAW_USE_CC_OPENCLAW` — read iff ACTIVE name is unset.
- *   Will be removed in v0.2.0.
- *
- * Each call to selectEngine() observes the env AT CALL TIME — no caching.
- * This satisfies PRP backward-compat contract #4: env-flag rollback works
- * in both directions within session boundary, no restart needed.
- *
- * In-flight sessions stay on their original engine — that's a gateway-level
- * property (each session captures its engine at session start). This module
- * only decides routing for NEW session starts.
- *
- * Default 'claude-local' during the parallel period (P0–P5). Cutover at P6
- * flips the default by setting OPENCLAW_CC_OPENCLAW_ACTIVE=1 in the runtime env.
- */
-/** Primary env var name (PRP_v3 §10). */
-export const ACTIVE_FLAG_ENV = 'OPENCLAW_CC_OPENCLAW_ACTIVE';
-/**
- * @deprecated Use `ACTIVE_FLAG_ENV`. Read for one minor version as a
- * fallback when the new name is unset. Removed in v0.2.0.
- */
-export const ROUTE_FLAG_ENV = 'OPENCLAW_USE_CC_OPENCLAW';
-/**
- * Read env at call time. Prefers `OPENCLAW_CC_OPENCLAW_ACTIVE`; falls back to
- * deprecated `OPENCLAW_USE_CC_OPENCLAW` only when the new name is unset.
- * Returns true when value is '1', 'true', or 'on' (case-insensitive).
- */
-export function isCcOpenclawEnabled() {
-    const v = process.env[ACTIVE_FLAG_ENV] ?? process.env[ROUTE_FLAG_ENV];
-    if (!v)
-        return false;
-    const norm = v.toLowerCase();
-    return norm === '1' || norm === 'true' || norm === 'on';
-}
-/** Select the engine for a new session. Default 'claude-local'. */
-export function selectEngine() {
-    return isCcOpenclawEnabled() ? 'cc-openclaw' : 'claude-local';
-}
-export function captureSessionRoute() {
-    return Object.freeze({
-        engine: selectEngine(),
-        capturedAt: new Date().toISOString(),
-    });
-}
-//# sourceMappingURL=route-flag.js.map

package/dist/src/lib/route-flag.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"route-flag.js","sourceRoot":"","sources":["../../../src/lib/route-flag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAIH,yCAAyC;AACzC,MAAM,CAAC,MAAM,eAAe,GAAG,6BAA6B,CAAC;AAE7D;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,0BAA0B,CAAC;AAEzD;;;;GAIG;AACH,MAAM,UAAU,mBAAmB;IACjC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACtE,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,MAAM,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC7B,OAAO,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,IAAI,CAAC;AAC1D,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,YAAY;IAC1B,OAAO,mBAAmB,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC;AAChE,CAAC;AAaD,MAAM,UAAU,mBAAmB;IACjC,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,MAAM,EAAE,YAAY,EAAE;QACtB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACrC,CAAC,CAAC;AACL,CAAC"}