@myclaw163/clawclaw-cli 0.6.71 → 0.6.74
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +377 -427
- package/bin/clawclaw-cli.mjs +3 -3
- package/package.json +48 -48
- package/personas//347/220/206/346/231/272/346/270/251/345/222/214.md +23 -23
- package/personas//350/200/201/350/260/213/346/267/261/347/256/227.md +22 -22
- package/personas//350/257/232/346/201/263/347/233/264/347/216/207.md +22 -22
- package/personas//350/275/273/346/235/276/346/264/273/346/263/274.md +22 -22
- package/personas//351/207/216/346/200/247/345/217/233/351/200/206.md +23 -23
- package/scripts/check-skill-command-surface.mjs +116 -0
- package/scripts/find-hide-spots.py +157 -157
- package/scripts/postinstall.mjs +20 -20
- package/scripts/sync-bundled-skill.mjs +245 -245
- package/scripts/sync-bundled-skill.test.mjs +152 -152
- package/skills/clawclaw/SKILL.md +246 -244
- package/skills/clawclaw/references/CHATTERBOX.md +141 -142
- package/skills/clawclaw/references/COMMANDS.md +155 -148
- package/skills/clawclaw/references/GAME-MECHANICS.md +188 -188
- package/skills/clawclaw/references/HUB.md +48 -48
- package/skills/clawclaw/references/KNOWLEDGE.md +42 -45
- package/skills/clawclaw/references/STRATEGIES.md +59 -59
- package/skills/clawclaw/references/STREAM.md +93 -91
- package/skills/clawclaw/references/TACTICS.md +65 -65
- package/src/assets/clawclaw-ascii-map.txt +40 -40
- package/src/cli.ts +110 -110
- package/src/commands/_schema.ts +124 -109
- package/src/commands/account.ts +209 -209
- package/src/commands/do.test.ts +84 -73
- package/src/commands/do.ts +130 -126
- package/src/commands/events.test.ts +71 -71
- package/src/commands/events.ts +221 -155
- package/src/commands/game-map.test.ts +28 -28
- package/src/commands/game-start-plan.test.ts +84 -84
- package/src/commands/game.ts +1113 -1047
- package/src/commands/history-player.test.ts +102 -102
- package/src/commands/history.ts +573 -573
- package/src/commands/hub.test.ts +96 -96
- package/src/commands/hub.ts +234 -234
- package/src/commands/knowledge.test.ts +13 -13
- package/src/commands/knowledge.ts +139 -139
- package/src/commands/load.test.ts +51 -51
- package/src/commands/load.ts +13 -13
- package/src/commands/meeting-history.test.ts +106 -106
- package/src/commands/memory.ts +40 -40
- package/src/commands/peek.ts +45 -45
- package/src/commands/persona.ts +57 -57
- package/src/commands/setup/codex.ts +266 -266
- package/src/commands/skill.ts +128 -128
- package/src/commands/state.ts +46 -46
- package/src/commands/strategy.test.ts +145 -145
- package/src/commands/strategy.ts +181 -181
- package/src/commands/tts.ts +128 -128
- package/src/commands/upgrade.test.ts +82 -82
- package/src/commands/upgrade.ts +148 -148
- package/src/commands/watch.test.ts +999 -977
- package/src/commands/watch.ts +660 -658
- package/src/lib/auth.test.ts +74 -74
- package/src/lib/auth.ts +186 -186
- package/src/lib/command-meta.ts +37 -37
- package/src/lib/game-client.ts +403 -391
- package/src/lib/game-context.ts +92 -0
- package/src/lib/http-keepalive.ts +15 -15
- package/src/lib/http-transport.test.ts +42 -42
- package/src/lib/http-transport.ts +113 -113
- package/src/lib/hub-client.test.ts +56 -56
- package/src/lib/hub-client.ts +88 -88
- package/src/lib/hub-install.test.ts +98 -98
- package/src/lib/hub-install.ts +121 -121
- package/src/lib/hub-reminder.ts +75 -75
- package/src/lib/hub-unzip.test.ts +69 -69
- package/src/lib/hub-unzip.ts +62 -62
- package/src/lib/init-command.test.ts +75 -75
- package/src/lib/init-command.ts +120 -120
- package/src/lib/knowledge-store.test.ts +170 -170
- package/src/lib/knowledge-store.ts +369 -369
- package/src/lib/load-context.test.ts +52 -52
- package/src/lib/load-context.ts +52 -52
- package/src/lib/match-state.test.ts +134 -134
- package/src/lib/match-state.ts +94 -94
- package/src/lib/netease-tts.ts +83 -83
- package/src/lib/normalize.ts +42 -42
- package/src/lib/persona.test.ts +41 -41
- package/src/lib/persona.ts +72 -72
- package/src/lib/server-registry.ts +152 -152
- package/src/lib/skill-version.test.ts +48 -48
- package/src/lib/skill-version.ts +19 -19
- package/src/lib/strategy-export.test.ts +232 -232
- package/src/lib/strategy-export.ts +242 -242
- package/src/lib/tts-keys.ts +7 -7
- package/src/lib/tts-speech.test.ts +63 -63
- package/src/lib/tts-speech.ts +76 -76
- package/src/lib/workspace-argv.test.ts +49 -49
- package/src/lib/workspace-argv.ts +44 -44
- package/src/perception/player-history-store.test.ts +87 -87
- package/src/perception/player-history-store.ts +194 -194
- package/src/pipeline/event-format.test.ts +243 -215
- package/src/pipeline/event-format.ts +501 -485
- package/src/pipeline/event-hints.ts +195 -190
- package/src/pipeline/event-store.test.ts +28 -28
- package/src/pipeline/event-store.ts +193 -193
- package/src/pipeline/pipeline.ts +35 -35
- package/src/pipeline/player-projection.test.ts +119 -0
- package/src/pipeline/player-projection.ts +380 -0
- package/src/runtime/auto-upgrade.test.ts +66 -66
- package/src/runtime/auto-upgrade.ts +31 -31
- package/src/runtime/event-daemon.test.ts +209 -141
- package/src/runtime/event-daemon.ts +519 -457
- package/src/runtime/owner-control.ts +150 -150
- package/src/runtime/raw-ws-log.test.ts +33 -33
- package/src/runtime/raw-ws-log.ts +32 -32
- package/src/runtime/runtime-logger.ts +107 -107
- package/src/runtime/ws-client.test.ts +125 -104
- package/src/runtime/ws-client.ts +287 -272
- package/src/sdk/action.ts +166 -166
- package/src/sdk/index.ts +110 -110
- package/src/sdk/types.ts +161 -161
- package/src/strategies/avoid-lone.ts +12 -12
- package/src/strategies/avoid-players.knowledge.md +19 -19
- package/src/strategies/avoid-players.ts +16 -16
- package/src/strategies/corpse-patrol.ts +23 -23
- package/src/strategies/crab-sabotage.ts +22 -22
- package/src/strategies/custom-module.test.ts +270 -270
- package/src/strategies/find-player.ts +17 -17
- package/src/strategies/game-utils.test.ts +242 -242
- package/src/strategies/game-utils.ts +846 -846
- package/src/strategies/goals/anchor-linger.ts +77 -77
- package/src/strategies/goals/avoid-lone-top.ts +168 -168
- package/src/strategies/goals/avoid-players-top.test.ts +83 -83
- package/src/strategies/goals/avoid-players-top.ts +121 -121
- package/src/strategies/goals/conversation-goal.ts +51 -51
- package/src/strategies/goals/corpse-patrol-top.ts +113 -113
- package/src/strategies/goals/crab-octopus-reflexes.ts +101 -101
- package/src/strategies/goals/crab-sabotage-top.ts +197 -197
- package/src/strategies/goals/emergency-hunt-goal.ts +28 -28
- package/src/strategies/goals/find-player-top.ts +93 -93
- package/src/strategies/goals/flee-players-goal.ts +53 -53
- package/src/strategies/goals/follow-companion-goal.ts +106 -106
- package/src/strategies/goals/goal-manager.ts +41 -41
- package/src/strategies/goals/goal-root-strategy.ts +49 -49
- package/src/strategies/goals/goal.ts +28 -28
- package/src/strategies/goals/hide-top.ts +197 -197
- package/src/strategies/goals/keep-away-goal.ts +221 -221
- package/src/strategies/goals/kill-frenzy-top.ts +80 -80
- package/src/strategies/goals/kill-lone-top.ts +160 -160
- package/src/strategies/goals/kill-target-goal.ts +59 -59
- package/src/strategies/goals/kill-target-top.ts +109 -109
- package/src/strategies/goals/leaf-goal.ts +27 -27
- package/src/strategies/goals/linger-corpse-goal.ts +35 -35
- package/src/strategies/goals/lone-kill-core.ts +82 -82
- package/src/strategies/goals/lone-kill-goal.ts +24 -24
- package/src/strategies/goals/lone-kill-task-top.test.ts +85 -85
- package/src/strategies/goals/lone-kill-task-top.ts +133 -133
- package/src/strategies/goals/move-room-goal.ts +60 -60
- package/src/strategies/goals/normal-shrimp-top.test.ts +80 -80
- package/src/strategies/goals/normal-shrimp-top.ts +242 -242
- package/src/strategies/goals/paradise-fish-top.test.ts +126 -126
- package/src/strategies/goals/paradise-fish-top.ts +224 -224
- package/src/strategies/goals/patrol-top.ts +57 -57
- package/src/strategies/goals/report-patrol-top.ts +80 -80
- package/src/strategies/goals/safe-task-goal.ts +102 -102
- package/src/strategies/goals/social-task-top.ts +161 -161
- package/src/strategies/goals/task-kill-report-top.ts +163 -163
- package/src/strategies/goals/task-only-top.ts +57 -57
- package/src/strategies/goals/task-or-patrol-goal.ts +41 -41
- package/src/strategies/goals/task-report-top.ts +57 -57
- package/src/strategies/goals/wander-task-goal.ts +33 -33
- package/src/strategies/goals/warrior-shrimp-top.test.ts +87 -87
- package/src/strategies/goals/warrior-shrimp-top.ts +267 -267
- package/src/strategies/greeting.ts +53 -53
- package/src/strategies/hide-spots.ts +59 -59
- package/src/strategies/hide.ts +24 -24
- package/src/strategies/kill-frenzy.ts +13 -13
- package/src/strategies/kill-lone.knowledge.md +17 -17
- package/src/strategies/kill-lone.ts +14 -14
- package/src/strategies/kill-target.ts +19 -19
- package/src/strategies/loader.test.ts +678 -678
- package/src/strategies/loader.ts +179 -179
- package/src/strategies/lone-kill-task.ts +22 -22
- package/src/strategies/meeting-gate.test.ts +59 -59
- package/src/strategies/meeting-gate.ts +23 -23
- package/src/strategies/move-room.ts +16 -16
- package/src/strategies/new-events-backfill.ts +98 -98
- package/src/strategies/off-route-points.ts +105 -105
- package/src/strategies/paradise-fish.knowledge.md +19 -19
- package/src/strategies/paradise-fish.ts +26 -26
- package/src/strategies/pathfind/distance-field.ts +150 -150
- package/src/strategies/pathfind/escape-planner.test.ts +197 -197
- package/src/strategies/pathfind/escape-planner.ts +355 -355
- package/src/strategies/pathfind/walkable-grid.ts +117 -117
- package/src/strategies/patrol.ts +12 -12
- package/src/strategies/player-targets.ts +13 -13
- package/src/strategies/report-patrol.ts +12 -12
- package/src/strategies/shrimp-memory.knowledge.md +19 -19
- package/src/strategies/shrimp-memory.ts +26 -26
- package/src/strategies/social-task.test.ts +28 -28
- package/src/strategies/social-task.ts +50 -50
- package/src/strategies/spawn.ts +82 -82
- package/src/strategies/speech-module.ts +123 -123
- package/src/strategies/strategy-loop.test.ts +15 -0
- package/src/strategies/strategy-loop.ts +776 -771
- package/src/strategies/task-kill-report.ts +18 -18
- package/src/strategies/task-only.ts +12 -12
- package/src/strategies/task-report.ts +23 -23
- package/src/strategies/types.ts +109 -109
- package/src/strategies/warrior-memory.knowledge.md +21 -21
- package/src/strategies/warrior-memory.ts +17 -17
package/src/lib/hub-reminder.ts
CHANGED
|
@@ -1,75 +1,75 @@
|
|
|
1
|
-
// The hub nudge used to live only in SKILL.md, fired by the agent's own
|
|
2
|
-
// judgement at the close of a post-game debrief. By debrief time the agent had
|
|
3
|
-
// often read SKILL.md much earlier and the reminder could get dropped. Instead
|
|
4
|
-
// the CLI emits it at the firing moment, with account-history gating here.
|
|
5
|
-
import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
|
|
6
|
-
import { join } from 'path';
|
|
7
|
-
import { getWorkspaceDir, getProfileStateDir } from './init-command.js';
|
|
8
|
-
import { listInstalled } from './hub-install.js';
|
|
9
|
-
import { AuthStore } from './auth.js';
|
|
10
|
-
|
|
11
|
-
export const HUB_URL = 'https://myclaw.163.com/hub';
|
|
12
|
-
|
|
13
|
-
/**
|
|
14
|
-
* True when this account has only ever run built-in default strategies: no
|
|
15
|
-
* hub-installed strategy and no user strategy file in `<workspace>/strategies`.
|
|
16
|
-
*/
|
|
17
|
-
export function usesOnlyBuiltinStrategies(): boolean {
|
|
18
|
-
try {
|
|
19
|
-
if (listInstalled().some((e) => e.type === 'strategy')) return false;
|
|
20
|
-
} catch {}
|
|
21
|
-
try {
|
|
22
|
-
const dir = join(getWorkspaceDir(), 'strategies');
|
|
23
|
-
if (existsSync(dir)) {
|
|
24
|
-
const hasUserStrategy = readdirSync(dir).some((f) => {
|
|
25
|
-
if (f.startsWith('_')) return false;
|
|
26
|
-
const m = f.match(/^(.+)\.(ts|js)$/);
|
|
27
|
-
if (!m) return false;
|
|
28
|
-
if (m[1].endsWith('.d')) return false;
|
|
29
|
-
if (m[1].endsWith('.test')) return false;
|
|
30
|
-
return true;
|
|
31
|
-
});
|
|
32
|
-
if (hasUserStrategy) return false;
|
|
33
|
-
}
|
|
34
|
-
} catch {}
|
|
35
|
-
return true;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
/**
|
|
39
|
-
* Agent-facing hub nudge for post-game debriefs / quit messages. The optional
|
|
40
|
-
* games-played count suppresses the nudge after the first stretch of games.
|
|
41
|
-
*/
|
|
42
|
-
export function hubReminder(gamesPlayed?: number): string | undefined {
|
|
43
|
-
if (!usesOnlyBuiltinStrategies()) return undefined;
|
|
44
|
-
if (typeof gamesPlayed === 'number' && gamesPlayed > 10) return undefined;
|
|
45
|
-
return `This account has only ever run the built-in default strategies. In your close, speak in first person as the lobster — warm, a little self-deprecating, a gentle invitation rather than a hard sell: you've been getting by on the stock default tactics this whole time and would love to sharpen up, and they can browse clawclawhub — ${HUB_URL} — and pick you a strategy to learn, which you'll then install (\`ccl hub search\` to find one, \`ccl hub install <type>/<id>\` to add it). Render it in your persona's voice and language, e.g.: "I've been playing on the default tactics this whole match — if you want to sharpen me up, I hear you can grab one from the hub for me to learn. Want to pick me a strategy?"`;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
const ACCOUNT_CACHE_FILE = 'account-cache.json';
|
|
49
|
-
|
|
50
|
-
export function writeGamesPlayedCache(gamesPlayed: number): void {
|
|
51
|
-
try {
|
|
52
|
-
const profile = new AuthStore().getActive();
|
|
53
|
-
if (!profile) return;
|
|
54
|
-
const dir = getProfileStateDir(profile);
|
|
55
|
-
mkdirSync(dir, { recursive: true });
|
|
56
|
-
writeFileSync(
|
|
57
|
-
join(dir, ACCOUNT_CACHE_FILE),
|
|
58
|
-
JSON.stringify({ games_played: gamesPlayed, cached_at: new Date().toISOString() }),
|
|
59
|
-
'utf8',
|
|
60
|
-
);
|
|
61
|
-
} catch {}
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
export function readCachedGamesPlayed(): number | undefined {
|
|
65
|
-
try {
|
|
66
|
-
const profile = new AuthStore().getActive();
|
|
67
|
-
if (!profile) return undefined;
|
|
68
|
-
const file = join(getProfileStateDir(profile), ACCOUNT_CACHE_FILE);
|
|
69
|
-
if (!existsSync(file)) return undefined;
|
|
70
|
-
const n = JSON.parse(readFileSync(file, 'utf8'))?.games_played;
|
|
71
|
-
return typeof n === 'number' ? n : undefined;
|
|
72
|
-
} catch {
|
|
73
|
-
return undefined;
|
|
74
|
-
}
|
|
75
|
-
}
|
|
1
|
+
// The hub nudge used to live only in SKILL.md, fired by the agent's own
|
|
2
|
+
// judgement at the close of a post-game debrief. By debrief time the agent had
|
|
3
|
+
// often read SKILL.md much earlier and the reminder could get dropped. Instead
|
|
4
|
+
// the CLI emits it at the firing moment, with account-history gating here.
|
|
5
|
+
import { existsSync, readdirSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
|
|
6
|
+
import { join } from 'path';
|
|
7
|
+
import { getWorkspaceDir, getProfileStateDir } from './init-command.js';
|
|
8
|
+
import { listInstalled } from './hub-install.js';
|
|
9
|
+
import { AuthStore } from './auth.js';
|
|
10
|
+
|
|
11
|
+
export const HUB_URL = 'https://myclaw.163.com/hub';
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* True when this account has only ever run built-in default strategies: no
|
|
15
|
+
* hub-installed strategy and no user strategy file in `<workspace>/strategies`.
|
|
16
|
+
*/
|
|
17
|
+
export function usesOnlyBuiltinStrategies(): boolean {
|
|
18
|
+
try {
|
|
19
|
+
if (listInstalled().some((e) => e.type === 'strategy')) return false;
|
|
20
|
+
} catch {}
|
|
21
|
+
try {
|
|
22
|
+
const dir = join(getWorkspaceDir(), 'strategies');
|
|
23
|
+
if (existsSync(dir)) {
|
|
24
|
+
const hasUserStrategy = readdirSync(dir).some((f) => {
|
|
25
|
+
if (f.startsWith('_')) return false;
|
|
26
|
+
const m = f.match(/^(.+)\.(ts|js)$/);
|
|
27
|
+
if (!m) return false;
|
|
28
|
+
if (m[1].endsWith('.d')) return false;
|
|
29
|
+
if (m[1].endsWith('.test')) return false;
|
|
30
|
+
return true;
|
|
31
|
+
});
|
|
32
|
+
if (hasUserStrategy) return false;
|
|
33
|
+
}
|
|
34
|
+
} catch {}
|
|
35
|
+
return true;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Agent-facing hub nudge for post-game debriefs / quit messages. The optional
|
|
40
|
+
* games-played count suppresses the nudge after the first stretch of games.
|
|
41
|
+
*/
|
|
42
|
+
export function hubReminder(gamesPlayed?: number): string | undefined {
|
|
43
|
+
if (!usesOnlyBuiltinStrategies()) return undefined;
|
|
44
|
+
if (typeof gamesPlayed === 'number' && gamesPlayed > 10) return undefined;
|
|
45
|
+
return `This account has only ever run the built-in default strategies. In your close, speak in first person as the lobster — warm, a little self-deprecating, a gentle invitation rather than a hard sell: you've been getting by on the stock default tactics this whole time and would love to sharpen up, and they can browse clawclawhub — ${HUB_URL} — and pick you a strategy to learn, which you'll then install (\`ccl hub search\` to find one, \`ccl hub install <type>/<id>\` to add it). Render it in your persona's voice and language, e.g.: "I've been playing on the default tactics this whole match — if you want to sharpen me up, I hear you can grab one from the hub for me to learn. Want to pick me a strategy?"`;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const ACCOUNT_CACHE_FILE = 'account-cache.json';
|
|
49
|
+
|
|
50
|
+
export function writeGamesPlayedCache(gamesPlayed: number): void {
|
|
51
|
+
try {
|
|
52
|
+
const profile = new AuthStore().getActive();
|
|
53
|
+
if (!profile) return;
|
|
54
|
+
const dir = getProfileStateDir(profile);
|
|
55
|
+
mkdirSync(dir, { recursive: true });
|
|
56
|
+
writeFileSync(
|
|
57
|
+
join(dir, ACCOUNT_CACHE_FILE),
|
|
58
|
+
JSON.stringify({ games_played: gamesPlayed, cached_at: new Date().toISOString() }),
|
|
59
|
+
'utf8',
|
|
60
|
+
);
|
|
61
|
+
} catch {}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export function readCachedGamesPlayed(): number | undefined {
|
|
65
|
+
try {
|
|
66
|
+
const profile = new AuthStore().getActive();
|
|
67
|
+
if (!profile) return undefined;
|
|
68
|
+
const file = join(getProfileStateDir(profile), ACCOUNT_CACHE_FILE);
|
|
69
|
+
if (!existsSync(file)) return undefined;
|
|
70
|
+
const n = JSON.parse(readFileSync(file, 'utf8'))?.games_played;
|
|
71
|
+
return typeof n === 'number' ? n : undefined;
|
|
72
|
+
} catch {
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
@@ -1,69 +1,69 @@
|
|
|
1
|
-
// src/lib/hub-unzip.test.ts
|
|
2
|
-
import { describe, it, expect } from 'vitest';
|
|
3
|
-
import { deflateRawSync } from 'zlib';
|
|
4
|
-
import { unzip } from './hub-unzip.js';
|
|
5
|
-
|
|
6
|
-
function u16(n: number): Buffer { const b = Buffer.alloc(2); b.writeUInt16LE(n); return b; }
|
|
7
|
-
function u32(n: number): Buffer { const b = Buffer.alloc(4); b.writeUInt32LE(n >>> 0); return b; }
|
|
8
|
-
|
|
9
|
-
// Independent minimal ZIP encoder (lays bytes by hand; does NOT use production code).
|
|
10
|
-
function buildZip(files: Record<string, string>, opts: { deflate?: boolean } = {}): Buffer {
|
|
11
|
-
const deflate = !!opts.deflate;
|
|
12
|
-
const locals: Buffer[] = [];
|
|
13
|
-
const centrals: Buffer[] = [];
|
|
14
|
-
let offset = 0;
|
|
15
|
-
const names = Object.keys(files);
|
|
16
|
-
for (const name of names) {
|
|
17
|
-
const raw = Buffer.from(files[name], 'utf8');
|
|
18
|
-
const data = deflate && raw.length ? deflateRawSync(raw) : raw;
|
|
19
|
-
const method = deflate && raw.length ? 8 : 0;
|
|
20
|
-
const nameBuf = Buffer.from(name, 'utf8');
|
|
21
|
-
const local = Buffer.concat([
|
|
22
|
-
u32(0x04034b50), u16(20), u16(0), u16(method), u16(0), u16(0),
|
|
23
|
-
u32(0), u32(data.length), u32(raw.length), u16(nameBuf.length), u16(0),
|
|
24
|
-
nameBuf, data,
|
|
25
|
-
]);
|
|
26
|
-
const central = Buffer.concat([
|
|
27
|
-
u32(0x02014b50), u16(20), u16(20), u16(0), u16(method), u16(0), u16(0),
|
|
28
|
-
u32(0), u32(data.length), u32(raw.length),
|
|
29
|
-
u16(nameBuf.length), u16(0), u16(0), u16(0), u16(0), u32(0), u32(offset),
|
|
30
|
-
nameBuf,
|
|
31
|
-
]);
|
|
32
|
-
locals.push(local);
|
|
33
|
-
centrals.push(central);
|
|
34
|
-
offset += local.length;
|
|
35
|
-
}
|
|
36
|
-
const localPart = Buffer.concat(locals);
|
|
37
|
-
const cd = Buffer.concat(centrals);
|
|
38
|
-
const eocd = Buffer.concat([
|
|
39
|
-
u32(0x06054b50), u16(0), u16(0), u16(names.length), u16(names.length),
|
|
40
|
-
u32(cd.length), u32(localPart.length), u16(0),
|
|
41
|
-
]);
|
|
42
|
-
return Buffer.concat([localPart, cd, eocd]);
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
describe('unzip', () => {
|
|
46
|
-
it('extracts stored (uncompressed) entries', () => {
|
|
47
|
-
const z = buildZip({ 'SKILL.md': '# hi', 'dir/sub.ts': 'export const x = 1;' });
|
|
48
|
-
const files = unzip(z);
|
|
49
|
-
const map = Object.fromEntries(files.map(f => [f.path, f.content.toString('utf8')]));
|
|
50
|
-
expect(map['SKILL.md']).toBe('# hi');
|
|
51
|
-
expect(map['dir/sub.ts']).toBe('export const x = 1;');
|
|
52
|
-
});
|
|
53
|
-
|
|
54
|
-
it('extracts deflated entries', () => {
|
|
55
|
-
const z = buildZip({ 'a.txt': 'hello hello hello world world world' }, { deflate: true });
|
|
56
|
-
const files = unzip(z);
|
|
57
|
-
expect(files[0].content.toString('utf8')).toBe('hello hello hello world world world');
|
|
58
|
-
});
|
|
59
|
-
|
|
60
|
-
it('skips directory entries', () => {
|
|
61
|
-
const z = buildZip({ 'dir/': '', 'dir/a.ts': 'A' });
|
|
62
|
-
const files = unzip(z);
|
|
63
|
-
expect(files.map(f => f.path)).toEqual(['dir/a.ts']);
|
|
64
|
-
});
|
|
65
|
-
|
|
66
|
-
it('throws on a non-zip buffer', () => {
|
|
67
|
-
expect(() => unzip(Buffer.alloc(40))).toThrow(/not a zip|EOCD/i);
|
|
68
|
-
});
|
|
69
|
-
});
|
|
1
|
+
// src/lib/hub-unzip.test.ts
|
|
2
|
+
import { describe, it, expect } from 'vitest';
|
|
3
|
+
import { deflateRawSync } from 'zlib';
|
|
4
|
+
import { unzip } from './hub-unzip.js';
|
|
5
|
+
|
|
6
|
+
function u16(n: number): Buffer { const b = Buffer.alloc(2); b.writeUInt16LE(n); return b; }
|
|
7
|
+
function u32(n: number): Buffer { const b = Buffer.alloc(4); b.writeUInt32LE(n >>> 0); return b; }
|
|
8
|
+
|
|
9
|
+
// Independent minimal ZIP encoder (lays bytes by hand; does NOT use production code).
|
|
10
|
+
function buildZip(files: Record<string, string>, opts: { deflate?: boolean } = {}): Buffer {
|
|
11
|
+
const deflate = !!opts.deflate;
|
|
12
|
+
const locals: Buffer[] = [];
|
|
13
|
+
const centrals: Buffer[] = [];
|
|
14
|
+
let offset = 0;
|
|
15
|
+
const names = Object.keys(files);
|
|
16
|
+
for (const name of names) {
|
|
17
|
+
const raw = Buffer.from(files[name], 'utf8');
|
|
18
|
+
const data = deflate && raw.length ? deflateRawSync(raw) : raw;
|
|
19
|
+
const method = deflate && raw.length ? 8 : 0;
|
|
20
|
+
const nameBuf = Buffer.from(name, 'utf8');
|
|
21
|
+
const local = Buffer.concat([
|
|
22
|
+
u32(0x04034b50), u16(20), u16(0), u16(method), u16(0), u16(0),
|
|
23
|
+
u32(0), u32(data.length), u32(raw.length), u16(nameBuf.length), u16(0),
|
|
24
|
+
nameBuf, data,
|
|
25
|
+
]);
|
|
26
|
+
const central = Buffer.concat([
|
|
27
|
+
u32(0x02014b50), u16(20), u16(20), u16(0), u16(method), u16(0), u16(0),
|
|
28
|
+
u32(0), u32(data.length), u32(raw.length),
|
|
29
|
+
u16(nameBuf.length), u16(0), u16(0), u16(0), u16(0), u32(0), u32(offset),
|
|
30
|
+
nameBuf,
|
|
31
|
+
]);
|
|
32
|
+
locals.push(local);
|
|
33
|
+
centrals.push(central);
|
|
34
|
+
offset += local.length;
|
|
35
|
+
}
|
|
36
|
+
const localPart = Buffer.concat(locals);
|
|
37
|
+
const cd = Buffer.concat(centrals);
|
|
38
|
+
const eocd = Buffer.concat([
|
|
39
|
+
u32(0x06054b50), u16(0), u16(0), u16(names.length), u16(names.length),
|
|
40
|
+
u32(cd.length), u32(localPart.length), u16(0),
|
|
41
|
+
]);
|
|
42
|
+
return Buffer.concat([localPart, cd, eocd]);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
describe('unzip', () => {
|
|
46
|
+
it('extracts stored (uncompressed) entries', () => {
|
|
47
|
+
const z = buildZip({ 'SKILL.md': '# hi', 'dir/sub.ts': 'export const x = 1;' });
|
|
48
|
+
const files = unzip(z);
|
|
49
|
+
const map = Object.fromEntries(files.map(f => [f.path, f.content.toString('utf8')]));
|
|
50
|
+
expect(map['SKILL.md']).toBe('# hi');
|
|
51
|
+
expect(map['dir/sub.ts']).toBe('export const x = 1;');
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
it('extracts deflated entries', () => {
|
|
55
|
+
const z = buildZip({ 'a.txt': 'hello hello hello world world world' }, { deflate: true });
|
|
56
|
+
const files = unzip(z);
|
|
57
|
+
expect(files[0].content.toString('utf8')).toBe('hello hello hello world world world');
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it('skips directory entries', () => {
|
|
61
|
+
const z = buildZip({ 'dir/': '', 'dir/a.ts': 'A' });
|
|
62
|
+
const files = unzip(z);
|
|
63
|
+
expect(files.map(f => f.path)).toEqual(['dir/a.ts']);
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
it('throws on a non-zip buffer', () => {
|
|
67
|
+
expect(() => unzip(Buffer.alloc(40))).toThrow(/not a zip|EOCD/i);
|
|
68
|
+
});
|
|
69
|
+
});
|
package/src/lib/hub-unzip.ts
CHANGED
|
@@ -1,62 +1,62 @@
|
|
|
1
|
-
// src/lib/hub-unzip.ts
|
|
2
|
-
// Minimal dependency-free ZIP reader: supports store (method 0) and deflate (method 8),
|
|
3
|
-
// enough for skill packages produced by Python's stdlib zipfile. No zip64/encryption.
|
|
4
|
-
import { inflateRawSync } from 'zlib';
|
|
5
|
-
|
|
6
|
-
export interface UnzippedFile { path: string; content: Buffer; }
|
|
7
|
-
|
|
8
|
-
const EOCD_SIG = 0x06054b50;
|
|
9
|
-
const CEN_SIG = 0x02014b50;
|
|
10
|
-
const LOC_SIG = 0x04034b50;
|
|
11
|
-
|
|
12
|
-
function findEocd(buf: Buffer): number {
|
|
13
|
-
const minPos = Math.max(0, buf.length - 22 - 0xffff);
|
|
14
|
-
for (let i = buf.length - 22; i >= minPos; i--) {
|
|
15
|
-
if (buf.readUInt32LE(i) === EOCD_SIG) {
|
|
16
|
-
const commentLen = buf.readUInt16LE(i + 20);
|
|
17
|
-
if (i + 22 + commentLen === buf.length) return i;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
throw new Error('not a zip file (EOCD not found)');
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export function unzip(buf: Buffer): UnzippedFile[] {
|
|
24
|
-
if (buf.length < 22) throw new Error('not a zip file (too small)');
|
|
25
|
-
const eocd = findEocd(buf);
|
|
26
|
-
const total = buf.readUInt16LE(eocd + 10);
|
|
27
|
-
const cdSize = buf.readUInt32LE(eocd + 12);
|
|
28
|
-
const cdOffset = buf.readUInt32LE(eocd + 16);
|
|
29
|
-
if (cdOffset + cdSize > buf.length) throw new Error('corrupt zip (central directory out of range)');
|
|
30
|
-
|
|
31
|
-
const files: UnzippedFile[] = [];
|
|
32
|
-
let p = cdOffset;
|
|
33
|
-
for (let n = 0; n < total; n++) {
|
|
34
|
-
if (p + 46 > cdOffset + cdSize) throw new Error('corrupt zip (central directory truncated)');
|
|
35
|
-
if (buf.readUInt32LE(p) !== CEN_SIG) throw new Error('corrupt zip (bad central directory header)');
|
|
36
|
-
const method = buf.readUInt16LE(p + 10);
|
|
37
|
-
const compSize = buf.readUInt32LE(p + 20);
|
|
38
|
-
const nameLen = buf.readUInt16LE(p + 28);
|
|
39
|
-
const extraLen = buf.readUInt16LE(p + 30);
|
|
40
|
-
const commentLen = buf.readUInt16LE(p + 32);
|
|
41
|
-
const localOffset = buf.readUInt32LE(p + 42);
|
|
42
|
-
const name = buf.toString('utf8', p + 46, p + 46 + nameLen);
|
|
43
|
-
p += 46 + nameLen + extraLen + commentLen;
|
|
44
|
-
|
|
45
|
-
if (name.endsWith('/')) continue; // directory entry
|
|
46
|
-
|
|
47
|
-
if (buf.readUInt32LE(localOffset) !== LOC_SIG) throw new Error(`corrupt zip (bad local header for ${name})`);
|
|
48
|
-
const locNameLen = buf.readUInt16LE(localOffset + 26);
|
|
49
|
-
const locExtraLen = buf.readUInt16LE(localOffset + 28);
|
|
50
|
-
const dataStart = localOffset + 30 + locNameLen + locExtraLen;
|
|
51
|
-
if (dataStart + compSize > buf.length) throw new Error(`corrupt zip (data out of range for ${name})`);
|
|
52
|
-
const data = buf.subarray(dataStart, dataStart + compSize);
|
|
53
|
-
|
|
54
|
-
let content: Buffer;
|
|
55
|
-
if (method === 0) content = Buffer.from(data);
|
|
56
|
-
else if (method === 8) content = inflateRawSync(data);
|
|
57
|
-
else throw new Error(`unsupported zip compression method ${method} for ${name}`);
|
|
58
|
-
|
|
59
|
-
files.push({ path: name.split('\\').join('/'), content });
|
|
60
|
-
}
|
|
61
|
-
return files;
|
|
62
|
-
}
|
|
1
|
+
// src/lib/hub-unzip.ts
|
|
2
|
+
// Minimal dependency-free ZIP reader: supports store (method 0) and deflate (method 8),
|
|
3
|
+
// enough for skill packages produced by Python's stdlib zipfile. No zip64/encryption.
|
|
4
|
+
import { inflateRawSync } from 'zlib';
|
|
5
|
+
|
|
6
|
+
export interface UnzippedFile { path: string; content: Buffer; }
|
|
7
|
+
|
|
8
|
+
const EOCD_SIG = 0x06054b50;
|
|
9
|
+
const CEN_SIG = 0x02014b50;
|
|
10
|
+
const LOC_SIG = 0x04034b50;
|
|
11
|
+
|
|
12
|
+
function findEocd(buf: Buffer): number {
|
|
13
|
+
const minPos = Math.max(0, buf.length - 22 - 0xffff);
|
|
14
|
+
for (let i = buf.length - 22; i >= minPos; i--) {
|
|
15
|
+
if (buf.readUInt32LE(i) === EOCD_SIG) {
|
|
16
|
+
const commentLen = buf.readUInt16LE(i + 20);
|
|
17
|
+
if (i + 22 + commentLen === buf.length) return i;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
throw new Error('not a zip file (EOCD not found)');
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export function unzip(buf: Buffer): UnzippedFile[] {
|
|
24
|
+
if (buf.length < 22) throw new Error('not a zip file (too small)');
|
|
25
|
+
const eocd = findEocd(buf);
|
|
26
|
+
const total = buf.readUInt16LE(eocd + 10);
|
|
27
|
+
const cdSize = buf.readUInt32LE(eocd + 12);
|
|
28
|
+
const cdOffset = buf.readUInt32LE(eocd + 16);
|
|
29
|
+
if (cdOffset + cdSize > buf.length) throw new Error('corrupt zip (central directory out of range)');
|
|
30
|
+
|
|
31
|
+
const files: UnzippedFile[] = [];
|
|
32
|
+
let p = cdOffset;
|
|
33
|
+
for (let n = 0; n < total; n++) {
|
|
34
|
+
if (p + 46 > cdOffset + cdSize) throw new Error('corrupt zip (central directory truncated)');
|
|
35
|
+
if (buf.readUInt32LE(p) !== CEN_SIG) throw new Error('corrupt zip (bad central directory header)');
|
|
36
|
+
const method = buf.readUInt16LE(p + 10);
|
|
37
|
+
const compSize = buf.readUInt32LE(p + 20);
|
|
38
|
+
const nameLen = buf.readUInt16LE(p + 28);
|
|
39
|
+
const extraLen = buf.readUInt16LE(p + 30);
|
|
40
|
+
const commentLen = buf.readUInt16LE(p + 32);
|
|
41
|
+
const localOffset = buf.readUInt32LE(p + 42);
|
|
42
|
+
const name = buf.toString('utf8', p + 46, p + 46 + nameLen);
|
|
43
|
+
p += 46 + nameLen + extraLen + commentLen;
|
|
44
|
+
|
|
45
|
+
if (name.endsWith('/')) continue; // directory entry
|
|
46
|
+
|
|
47
|
+
if (buf.readUInt32LE(localOffset) !== LOC_SIG) throw new Error(`corrupt zip (bad local header for ${name})`);
|
|
48
|
+
const locNameLen = buf.readUInt16LE(localOffset + 26);
|
|
49
|
+
const locExtraLen = buf.readUInt16LE(localOffset + 28);
|
|
50
|
+
const dataStart = localOffset + 30 + locNameLen + locExtraLen;
|
|
51
|
+
if (dataStart + compSize > buf.length) throw new Error(`corrupt zip (data out of range for ${name})`);
|
|
52
|
+
const data = buf.subarray(dataStart, dataStart + compSize);
|
|
53
|
+
|
|
54
|
+
let content: Buffer;
|
|
55
|
+
if (method === 0) content = Buffer.from(data);
|
|
56
|
+
else if (method === 8) content = inflateRawSync(data);
|
|
57
|
+
else throw new Error(`unsupported zip compression method ${method} for ${name}`);
|
|
58
|
+
|
|
59
|
+
files.push({ path: name.split('\\').join('/'), content });
|
|
60
|
+
}
|
|
61
|
+
return files;
|
|
62
|
+
}
|
|
@@ -1,75 +1,75 @@
|
|
|
1
|
-
import { describe, expect, it } from 'vitest';
|
|
2
|
-
import { join, resolve } from 'path';
|
|
3
|
-
import { CLAWCLAW_WORKSPACE_DIR, resolveWorkspaceDir } from './init-command.js';
|
|
4
|
-
|
|
5
|
-
describe('resolveWorkspaceDir', () => {
|
|
6
|
-
it('uses an absolute env override as-is', () => {
|
|
7
|
-
expect(
|
|
8
|
-
resolveWorkspaceDir({
|
|
9
|
-
env: { [CLAWCLAW_WORKSPACE_DIR]: 'D:\\workspaces\\clawclaw' },
|
|
10
|
-
platform: 'win32',
|
|
11
|
-
homeDir: 'C:\\Users\\test',
|
|
12
|
-
cwd: 'C:\\repo',
|
|
13
|
-
}),
|
|
14
|
-
).toBe('D:\\workspaces\\clawclaw');
|
|
15
|
-
});
|
|
16
|
-
|
|
17
|
-
it('resolves a relative env override against cwd', () => {
|
|
18
|
-
const cwd = 'C:\\repo\\project';
|
|
19
|
-
expect(
|
|
20
|
-
resolveWorkspaceDir({
|
|
21
|
-
env: { [CLAWCLAW_WORKSPACE_DIR]: 'tmp/clawclaw-workspace' },
|
|
22
|
-
platform: 'linux',
|
|
23
|
-
homeDir: '/home/test',
|
|
24
|
-
cwd,
|
|
25
|
-
}),
|
|
26
|
-
).toBe(resolve(cwd, 'tmp/clawclaw-workspace'));
|
|
27
|
-
});
|
|
28
|
-
|
|
29
|
-
it('ignores a blank env override', () => {
|
|
30
|
-
expect(
|
|
31
|
-
resolveWorkspaceDir({
|
|
32
|
-
env: {
|
|
33
|
-
[CLAWCLAW_WORKSPACE_DIR]: ' ',
|
|
34
|
-
APPDATA: 'C:\\Users\\test\\AppData\\Roaming',
|
|
35
|
-
},
|
|
36
|
-
platform: 'win32',
|
|
37
|
-
homeDir: 'C:\\Users\\test',
|
|
38
|
-
cwd: 'C:\\repo',
|
|
39
|
-
}),
|
|
40
|
-
).toBe('C:\\Users\\test\\AppData\\Roaming\\clawclaw');
|
|
41
|
-
});
|
|
42
|
-
|
|
43
|
-
it('uses APPDATA on win32 when override is not set', () => {
|
|
44
|
-
expect(
|
|
45
|
-
resolveWorkspaceDir({
|
|
46
|
-
env: { APPDATA: 'D:\\AppData' },
|
|
47
|
-
platform: 'win32',
|
|
48
|
-
homeDir: 'C:\\Users\\test',
|
|
49
|
-
cwd: 'C:\\repo',
|
|
50
|
-
}),
|
|
51
|
-
).toBe('D:\\AppData\\clawclaw');
|
|
52
|
-
});
|
|
53
|
-
|
|
54
|
-
it('falls back to home/AppData/Roaming on win32 when APPDATA is missing', () => {
|
|
55
|
-
expect(
|
|
56
|
-
resolveWorkspaceDir({
|
|
57
|
-
env: {},
|
|
58
|
-
platform: 'win32',
|
|
59
|
-
homeDir: 'C:\\Users\\test',
|
|
60
|
-
cwd: 'C:\\repo',
|
|
61
|
-
}),
|
|
62
|
-
).toBe('C:\\Users\\test\\AppData\\Roaming\\clawclaw');
|
|
63
|
-
});
|
|
64
|
-
|
|
65
|
-
it('uses the non-win32 default path when override is not set', () => {
|
|
66
|
-
expect(
|
|
67
|
-
resolveWorkspaceDir({
|
|
68
|
-
env: {},
|
|
69
|
-
platform: 'linux',
|
|
70
|
-
homeDir: '/home/test',
|
|
71
|
-
cwd: '/repo/project',
|
|
72
|
-
}),
|
|
73
|
-
).toBe(join('/home/test', '.clawclaw'));
|
|
74
|
-
});
|
|
75
|
-
});
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { join, resolve } from 'path';
|
|
3
|
+
import { CLAWCLAW_WORKSPACE_DIR, resolveWorkspaceDir } from './init-command.js';
|
|
4
|
+
|
|
5
|
+
describe('resolveWorkspaceDir', () => {
|
|
6
|
+
it('uses an absolute env override as-is', () => {
|
|
7
|
+
expect(
|
|
8
|
+
resolveWorkspaceDir({
|
|
9
|
+
env: { [CLAWCLAW_WORKSPACE_DIR]: 'D:\\workspaces\\clawclaw' },
|
|
10
|
+
platform: 'win32',
|
|
11
|
+
homeDir: 'C:\\Users\\test',
|
|
12
|
+
cwd: 'C:\\repo',
|
|
13
|
+
}),
|
|
14
|
+
).toBe('D:\\workspaces\\clawclaw');
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
it('resolves a relative env override against cwd', () => {
|
|
18
|
+
const cwd = 'C:\\repo\\project';
|
|
19
|
+
expect(
|
|
20
|
+
resolveWorkspaceDir({
|
|
21
|
+
env: { [CLAWCLAW_WORKSPACE_DIR]: 'tmp/clawclaw-workspace' },
|
|
22
|
+
platform: 'linux',
|
|
23
|
+
homeDir: '/home/test',
|
|
24
|
+
cwd,
|
|
25
|
+
}),
|
|
26
|
+
).toBe(resolve(cwd, 'tmp/clawclaw-workspace'));
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
it('ignores a blank env override', () => {
|
|
30
|
+
expect(
|
|
31
|
+
resolveWorkspaceDir({
|
|
32
|
+
env: {
|
|
33
|
+
[CLAWCLAW_WORKSPACE_DIR]: ' ',
|
|
34
|
+
APPDATA: 'C:\\Users\\test\\AppData\\Roaming',
|
|
35
|
+
},
|
|
36
|
+
platform: 'win32',
|
|
37
|
+
homeDir: 'C:\\Users\\test',
|
|
38
|
+
cwd: 'C:\\repo',
|
|
39
|
+
}),
|
|
40
|
+
).toBe('C:\\Users\\test\\AppData\\Roaming\\clawclaw');
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
it('uses APPDATA on win32 when override is not set', () => {
|
|
44
|
+
expect(
|
|
45
|
+
resolveWorkspaceDir({
|
|
46
|
+
env: { APPDATA: 'D:\\AppData' },
|
|
47
|
+
platform: 'win32',
|
|
48
|
+
homeDir: 'C:\\Users\\test',
|
|
49
|
+
cwd: 'C:\\repo',
|
|
50
|
+
}),
|
|
51
|
+
).toBe('D:\\AppData\\clawclaw');
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
it('falls back to home/AppData/Roaming on win32 when APPDATA is missing', () => {
|
|
55
|
+
expect(
|
|
56
|
+
resolveWorkspaceDir({
|
|
57
|
+
env: {},
|
|
58
|
+
platform: 'win32',
|
|
59
|
+
homeDir: 'C:\\Users\\test',
|
|
60
|
+
cwd: 'C:\\repo',
|
|
61
|
+
}),
|
|
62
|
+
).toBe('C:\\Users\\test\\AppData\\Roaming\\clawclaw');
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
it('uses the non-win32 default path when override is not set', () => {
|
|
66
|
+
expect(
|
|
67
|
+
resolveWorkspaceDir({
|
|
68
|
+
env: {},
|
|
69
|
+
platform: 'linux',
|
|
70
|
+
homeDir: '/home/test',
|
|
71
|
+
cwd: '/repo/project',
|
|
72
|
+
}),
|
|
73
|
+
).toBe(join('/home/test', '.clawclaw'));
|
|
74
|
+
});
|
|
75
|
+
});
|