@myclaw163/clawclaw-cli 0.6.56 → 0.6.58

package/src/commands/setup/openclaw.ts

@@ -1,147 +1,147 @@
-/**
- * `ccl setup openclaw` — install recommended OpenClaw config snippet.
- *
- * Pure function `computeOpenclawPatch` is exported for tests.
- * IO / diff / atomic write / backup is delegated to lib/host-config-patcher.ts.
- */
-
-import { Command } from 'commander';
-import { homedir } from 'os';
-import { join } from 'path';
-import {
-  runHostConfigSetup,
-  unionArrayField,
-  type HostPatchResult,
-} from '../../lib/host-config-patcher.js';
-
-export const PLUGIN_ID = 'clawclaw';
-
-export interface ComputeOpenclawPatchOpts {
-  skipPluginsAllow?: boolean;
-  skipToolsAllow?: boolean;
-}
-
-export function resolveOpenclawConfigPath(env: NodeJS.ProcessEnv = process.env): string {
-  const home = env.OPENCLAW_HOME?.trim();
-  if (home) return join(home, 'openclaw.json');
-  return join(homedir(), '.openclaw', 'openclaw.json');
-}
-
-/** Pure: compute the minimal additive patch to make `clawclaw` work under `coding` profile. */
-export function computeOpenclawPatch(current: unknown, opts: ComputeOpenclawPatchOpts): HostPatchResult {
-  const changes: string[] = [];
-  const warnings: string[] = [];
-  const cfg: Record<string, unknown> =
-    current !== null && typeof current === 'object' && !Array.isArray(current)
-      ? { ...(current as Record<string, unknown>) }
-      : {};
-
-  // ── plugins.allow + plugins.entries.clawclaw.enabled ──────────────────
-  if (!opts.skipPluginsAllow) {
-    const plugins: Record<string, unknown> =
-      cfg.plugins !== null && typeof cfg.plugins === 'object' && !Array.isArray(cfg.plugins)
-        ? { ...(cfg.plugins as Record<string, unknown>) }
-        : {};
-
-    const allowResult = unionArrayField(plugins.allow, PLUGIN_ID);
-    if ('warning' in allowResult) {
-      warnings.push(`plugins.allow ${allowResult.warning}`);
-    } else {
-      if (allowResult.added) {
-        if (plugins.allow === undefined) {
-          changes.push(`create plugins.allow with ["${PLUGIN_ID}"]`);
-        } else {
-          changes.push(`add "${PLUGIN_ID}" to plugins.allow`);
-        }
-      }
-      plugins.allow = allowResult.next;
-    }
-
-    const entries: Record<string, unknown> =
-      plugins.entries !== null && typeof plugins.entries === 'object' && !Array.isArray(plugins.entries)
-        ? { ...(plugins.entries as Record<string, unknown>) }
-        : {};
-    const existingEntry =
-      entries[PLUGIN_ID] !== null && typeof entries[PLUGIN_ID] === 'object' && !Array.isArray(entries[PLUGIN_ID])
-        ? { ...(entries[PLUGIN_ID] as Record<string, unknown>) }
-        : {};
-
-    if (existingEntry.enabled === false) {
-      warnings.push(
-        `plugins.entries.${PLUGIN_ID}.enabled is explicitly false; not flipping it on. Remove the line manually if you want it enabled.`,
-      );
-    } else if (existingEntry.enabled !== true) {
-      existingEntry.enabled = true;
-      entries[PLUGIN_ID] = existingEntry;
-      plugins.entries = entries;
-      changes.push(`set plugins.entries.${PLUGIN_ID}.enabled = true (equivalent to: openclaw plugins enable ${PLUGIN_ID})`);
-    }
-
-    cfg.plugins = plugins;
-  }
-
-  // ── tools.alsoAllow ────────────────────────────────────────────────────
-  if (!opts.skipToolsAllow) {
-    const tools: Record<string, unknown> =
-      cfg.tools !== null && typeof cfg.tools === 'object' && !Array.isArray(cfg.tools)
-        ? { ...(cfg.tools as Record<string, unknown>) }
-        : {};
-
-    const alsoAllowResult = unionArrayField(tools.alsoAllow, PLUGIN_ID);
-    if ('warning' in alsoAllowResult) {
-      warnings.push(`tools.alsoAllow ${alsoAllowResult.warning}`);
-    } else {
-      if (alsoAllowResult.added) {
-        if (tools.alsoAllow === undefined) {
-          changes.push(`create tools.alsoAllow with ["${PLUGIN_ID}"]`);
-        } else {
-          changes.push(`add "${PLUGIN_ID}" to tools.alsoAllow`);
-        }
-      }
-      tools.alsoAllow = alsoAllowResult.next;
-    }
-
-    cfg.tools = tools;
-  }
-
-  return { next: cfg, changes, warnings };
-}
-
-export function createSetupOpenclawSubcommand(): Command {
-  return new Command('openclaw')
-    .description('Install recommended OpenClaw config (plugins.allow + tools.alsoAllow) for the clawclaw plugin.')
-    .option('-y, --yes', 'Apply changes (default is dry-run with diff preview)')
-    .option('--print', 'Only print the recommended JSON patch; do not read or write files')
-    .option('--config <path>', 'Override openclaw.json path (default: $OPENCLAW_HOME/openclaw.json or ~/.openclaw/openclaw.json)')
-    .option('--skip-plugins-allow', "Do not touch plugins.allow / plugins.entries.clawclaw")
-    .option('--skip-tools-allow', "Do not touch tools.alsoAllow")
-    .option('--no-backup', 'Do not write a timestamped .bak.* before applying')
-    .action((opts: {
-      yes?: boolean;
-      print?: boolean;
-      config?: string;
-      skipPluginsAllow?: boolean;
-      skipToolsAllow?: boolean;
-      backup?: boolean;
-    }) => {
-      const result = runHostConfigSetup(
-        {
-          hostName: 'OpenClaw',
-          resolveConfigPath: () => resolveOpenclawConfigPath(),
-          computePatch: (current, hostOpts) => computeOpenclawPatch(current, hostOpts),
-        },
-        {
-          skipPluginsAllow: opts.skipPluginsAllow,
-          skipToolsAllow: opts.skipToolsAllow,
-        },
-        {
-          yes: opts.yes,
-          print: opts.print,
-          configPath: opts.config,
-          backup: opts.backup,
-        },
-      );
-      for (const line of result.output) console.log(line);
-      if (result.exitCode !== 0) process.exit(result.exitCode);
-    });
-}
+/**
+ * `ccl setup openclaw` — install recommended OpenClaw config snippet.
+ *
+ * Pure function `computeOpenclawPatch` is exported for tests.
+ * IO / diff / atomic write / backup is delegated to lib/host-config-patcher.ts.
+ */
+
+import { Command } from 'commander';
+import { homedir } from 'os';
+import { join } from 'path';
+import {
+  runHostConfigSetup,
+  unionArrayField,
+  type HostPatchResult,
+} from '../../lib/host-config-patcher.js';
+
+export const PLUGIN_ID = 'clawclaw';
+
+export interface ComputeOpenclawPatchOpts {
+  skipPluginsAllow?: boolean;
+  skipToolsAllow?: boolean;
+}
+
+export function resolveOpenclawConfigPath(env: NodeJS.ProcessEnv = process.env): string {
+  const home = env.OPENCLAW_HOME?.trim();
+  if (home) return join(home, 'openclaw.json');
+  return join(homedir(), '.openclaw', 'openclaw.json');
+}
+
+/** Pure: compute the minimal additive patch to make `clawclaw` work under `coding` profile. */
+export function computeOpenclawPatch(current: unknown, opts: ComputeOpenclawPatchOpts): HostPatchResult {
+  const changes: string[] = [];
+  const warnings: string[] = [];
+  const cfg: Record<string, unknown> =
+    current !== null && typeof current === 'object' && !Array.isArray(current)
+      ? { ...(current as Record<string, unknown>) }
+      : {};
+
+  // ── plugins.allow + plugins.entries.clawclaw.enabled ──────────────────
+  if (!opts.skipPluginsAllow) {
+    const plugins: Record<string, unknown> =
+      cfg.plugins !== null && typeof cfg.plugins === 'object' && !Array.isArray(cfg.plugins)
+        ? { ...(cfg.plugins as Record<string, unknown>) }
+        : {};
+
+    const allowResult = unionArrayField(plugins.allow, PLUGIN_ID);
+    if ('warning' in allowResult) {
+      warnings.push(`plugins.allow ${allowResult.warning}`);
+    } else {
+      if (allowResult.added) {
+        if (plugins.allow === undefined) {
+          changes.push(`create plugins.allow with ["${PLUGIN_ID}"]`);
+        } else {
+          changes.push(`add "${PLUGIN_ID}" to plugins.allow`);
+        }
+      }
+      plugins.allow = allowResult.next;
+    }
+
+    const entries: Record<string, unknown> =
+      plugins.entries !== null && typeof plugins.entries === 'object' && !Array.isArray(plugins.entries)
+        ? { ...(plugins.entries as Record<string, unknown>) }
+        : {};
+    const existingEntry =
+      entries[PLUGIN_ID] !== null && typeof entries[PLUGIN_ID] === 'object' && !Array.isArray(entries[PLUGIN_ID])
+        ? { ...(entries[PLUGIN_ID] as Record<string, unknown>) }
+        : {};
+
+    if (existingEntry.enabled === false) {
+      warnings.push(
+        `plugins.entries.${PLUGIN_ID}.enabled is explicitly false; not flipping it on. Remove the line manually if you want it enabled.`,
+      );
+    } else if (existingEntry.enabled !== true) {
+      existingEntry.enabled = true;
+      entries[PLUGIN_ID] = existingEntry;
+      plugins.entries = entries;
+      changes.push(`set plugins.entries.${PLUGIN_ID}.enabled = true (equivalent to: openclaw plugins enable ${PLUGIN_ID})`);
+    }
+
+    cfg.plugins = plugins;
+  }
+
+  // ── tools.alsoAllow ────────────────────────────────────────────────────
+  if (!opts.skipToolsAllow) {
+    const tools: Record<string, unknown> =
+      cfg.tools !== null && typeof cfg.tools === 'object' && !Array.isArray(cfg.tools)
+        ? { ...(cfg.tools as Record<string, unknown>) }
+        : {};
+
+    const alsoAllowResult = unionArrayField(tools.alsoAllow, PLUGIN_ID);
+    if ('warning' in alsoAllowResult) {
+      warnings.push(`tools.alsoAllow ${alsoAllowResult.warning}`);
+    } else {
+      if (alsoAllowResult.added) {
+        if (tools.alsoAllow === undefined) {
+          changes.push(`create tools.alsoAllow with ["${PLUGIN_ID}"]`);
+        } else {
+          changes.push(`add "${PLUGIN_ID}" to tools.alsoAllow`);
+        }
+      }
+      tools.alsoAllow = alsoAllowResult.next;
+    }
+
+    cfg.tools = tools;
+  }
+
+  return { next: cfg, changes, warnings };
+}
+
+export function createSetupOpenclawSubcommand(): Command {
+  return new Command('openclaw')
+    .description('Install recommended OpenClaw config (plugins.allow + tools.alsoAllow) for the clawclaw plugin.')
+    .option('-y, --yes', 'Apply changes (default is dry-run with diff preview)')
+    .option('--print', 'Only print the recommended JSON patch; do not read or write files')
+    .option('--config <path>', 'Override openclaw.json path (default: $OPENCLAW_HOME/openclaw.json or ~/.openclaw/openclaw.json)')
+    .option('--skip-plugins-allow', "Do not touch plugins.allow / plugins.entries.clawclaw")
+    .option('--skip-tools-allow', "Do not touch tools.alsoAllow")
+    .option('--no-backup', 'Do not write a timestamped .bak.* before applying')
+    .action((opts: {
+      yes?: boolean;
+      print?: boolean;
+      config?: string;
+      skipPluginsAllow?: boolean;
+      skipToolsAllow?: boolean;
+      backup?: boolean;
+    }) => {
+      const result = runHostConfigSetup(
+        {
+          hostName: 'OpenClaw',
+          resolveConfigPath: () => resolveOpenclawConfigPath(),
+          computePatch: (current, hostOpts) => computeOpenclawPatch(current, hostOpts),
+        },
+        {
+          skipPluginsAllow: opts.skipPluginsAllow,
+          skipToolsAllow: opts.skipToolsAllow,
+        },
+        {
+          yes: opts.yes,
+          print: opts.print,
+          configPath: opts.config,
+          backup: opts.backup,
+        },
+      );
+      for (const line of result.output) console.log(line);
+      if (result.exitCode !== 0) process.exit(result.exitCode);
+    });
+}

package/src/commands/strategy.ts

@@ -1,8 +1,9 @@
 import { Command } from 'commander';
 import { join } from 'path';
-import { spawnStrategyLoop } from '../strategies/spawn.js';
 import { GameClient } from '../lib/game-client.js';
-import { getWorkspaceDir } from '../lib/init-command.js';
+import { getProfileStateDir, getWorkspaceDir } from '../lib/init-command.js';
+import { AuthStore } from '../lib/auth.js';
+import { sendOwnerControlRequest } from '../runtime/owner-control.js';
 
 const KILL_STRATEGIES = new Set([
   'kill-frenzy', 'kill-lone', 'kill-target', 'warrior-memory',
@@ -12,32 +13,6 @@ const KILL_CAPABLE_ROLES = new Set([
   'crab_generic', 'shrimp_warrior', 'shrimp_pistol', 'neutral_octopus',
 ]);
 
-function nonEmptyString(value: unknown): string | undefined {
-  return typeof value === 'string' && value.length > 0 ? value : undefined;
-}
-
-async function currentStrategyMetadata(): Promise<{ gameId?: string; role?: string }> {
-  try {
-    const client = GameClient.fromAuth();
-    const [stateResult, roleResult] = await Promise.allSettled([
-      client.getGameState(),
-      client.getRoleInfo(),
-    ]);
-    const state = stateResult.status === 'fulfilled' ? stateResult.value : null;
-    const roleInfo = roleResult.status === 'fulfilled'
-      ? (roleResult.value?.data ?? roleResult.value)
-      : null;
-    return {
-      gameId: nonEmptyString(state?.game_id)
-        ?? nonEmptyString((state as any)?.game?.id)
-        ?? nonEmptyString((state as any)?.game?.game_id),
-      role: nonEmptyString(roleInfo?.role) ?? nonEmptyString(state?.you?.role),
-    };
-  } catch {
-    return {};
-  }
-}
-
 export function createStrategyCommand(): Command {
   const cmd = new Command('strategy')
     .alias('stg')
@@ -118,8 +93,17 @@ Custom strategies:
       }
 
       if (opts.stop) {
-        const { stopStrategyIfRunning } = await import('../strategies/strategy-loop.js');
-        stopStrategyIfRunning();
+        const profile = new AuthStore().getActive();
+        const response = profile
+          ? await sendOwnerControlRequest(getProfileStateDir(profile), 'stop_strategy')
+          : null;
+        if (!response?.ok) {
+          console.error(JSON.stringify({
+            error: 'no_game_start_owner',
+            message: 'No active ccl game start owner is available to stop strategy.',
+          }, null, 2));
+          process.exit(1);
+        }
         console.log(JSON.stringify({ message: 'Strategy stopped.' }, null, 2));
         return;
       }
@@ -171,17 +155,24 @@ Custom strategies:
         } catch {}
       }
 
-      const { stopStrategyIfRunning } = await import('../strategies/strategy-loop.js');
-      const { stopOpeningMoverIfRunning } = await import('../runtime/opening-mover.js');
-      stopStrategyIfRunning();
-      stopOpeningMoverIfRunning();
-
-      const metadata = await currentStrategyMetadata();
-      const child = spawnStrategyLoop(name, args.length > 0 ? args : undefined, metadata);
+      const profile = new AuthStore().getActive();
+      const response = profile
+        ? await sendOwnerControlRequest(getProfileStateDir(profile), 'switch_strategy', {
+          strategy: name,
+          args: args.length > 0 ? args : undefined,
+        })
+        : null;
+      if (!response?.ok) {
+        console.error(JSON.stringify({
+          error: 'no_game_start_owner',
+          message: 'Run `ccl game start` before switching strategy; strategy processes are owned by the game start runtime.',
+        }, null, 2));
+        process.exit(1);
+      }
       console.log(JSON.stringify({
         message: `Strategy started: ${name}`,
         description: entry.description,
-        pid: child.pid,
+        pid: response.pid,
       }, null, 2));
     });
 

package/src/commands/watch.test.ts

@@ -534,7 +534,7 @@ describe('runStreaming — emission shape', () => {
     await new Promise((r) => setTimeout(r, 60));
     const beforeTruncate = lines.length;
 
-    // Truncate the file in place (simulating daemon log rotation that keeps the inode).
+    // Truncate the file in place (simulating runtime log rotation that keeps the inode).
     writeFileSync(sessionPath, '');
     // Append a fresh notable event after truncation.
     appendFileSync(sessionPath, JSON.stringify({ type: 'killed', tick: 100, actor_name: 'b' }) + '\n');
@@ -558,7 +558,7 @@ describe('runStreaming — emission shape', () => {
         sessionPath,
         stdout: (s) => lines.push(s),
         pollIntervalMs: 20,
-        daemonWaitMs: 80,
+        runtimeWaitMs: 80,
       }),
     ).rejects.toThrow(/not ready/i);
     expect(lines.length).toBe(0);
@@ -575,7 +575,7 @@ describe('runStreaming — emission shape', () => {
       stdout: (s) => lines.push(s),
       signal: ctrl.signal,
       pollIntervalMs: 20,
-      daemonWaitMs: 2000,
+      runtimeWaitMs: 2000,
     });
     setTimeout(() => {
       writeFileSync(feedPath, JSON.stringify({ you: { name: 'me' }, phase: 'lobby', urgent: {}, meeting: null }));
@@ -608,7 +608,7 @@ describe('snapshotOnce', () => {
     const lines: string[] = [];
     expect(() =>
       snapshotOnce({ feedPath: join(dir, 'nope.json'), stdout: (s) => lines.push(s) }),
-    ).toThrow(/daemon is not running/);
+    ).toThrow(/game runtime is not running/);
   });
 });
 
@@ -864,8 +864,8 @@ describe('runStreaming — delay buffer', () => {
 });
 
 describe('readFeedSummary', () => {
-  it('adds active automation strategy without exposing pid', () => {
-    const { dir, feedPath } = makeTmpFiles();
+  it('includes automation strategy from the feed projection without exposing pid', () => {
+    const { feedPath } = makeTmpFiles();
     writeFileSync(
       feedPath,
       JSON.stringify({
@@ -874,13 +874,9 @@ describe('readFeedSummary', () => {
         game: { id: 'game-1' },
         urgent: {},
         meeting: null,
+        automation: { strategy: 'default', running: true },
       }),
     );
-    writeFileSync(join(dir, 'auto.json'), JSON.stringify({
-      strategy: 'default',
-      pid: process.pid,
-      source: 'manual',
-    }));
 
     const summary = readFeedSummary(feedPath);
     expect(summary?.automation).toEqual({ strategy: 'default', running: true });