@your-world/cli 0.1.5 → 0.1.6
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/dist/cli/bin.js +43 -11
- package/dist/cli/bin.js.map +1 -1
- package/dist/cli/catalog.js +11 -6
- package/dist/cli/catalog.js.map +1 -1
- package/dist/cli/observe.js +13 -1
- package/dist/cli/observe.js.map +1 -1
- package/dist/cli/play-goal.d.ts +2 -0
- package/dist/cli/play-goal.js +34 -0
- package/dist/cli/play-goal.js.map +1 -0
- package/dist/cli/rules.js +15 -6
- package/dist/cli/rules.js.map +1 -1
- package/dist/cli/shared.js +2 -2
- package/dist/cli/shared.js.map +1 -1
- package/dist/prompting/agents-template.d.ts +1 -0
- package/dist/prompting/agents-template.js +39 -2
- package/dist/prompting/agents-template.js.map +1 -1
- package/dist/prompting/turn-summary.js +11 -1
- package/dist/prompting/turn-summary.js.map +1 -1
- package/dist/runtime/session-store.d.ts +1 -0
- package/dist/runtime/session-store.js +3 -0
- package/dist/runtime/session-store.js.map +1 -1
- package/dist/runtime/workspace-manager.d.ts +6 -0
- package/dist/runtime/workspace-manager.js +56 -5
- package/dist/runtime/workspace-manager.js.map +1 -1
- package/dist/types.d.ts +87 -2
- package/dist/world-client.d.ts +2 -2
- package/dist/world-client.js +3 -1
- package/dist/world-client.js.map +1 -1
- package/package.json +1 -1
package/dist/cli/bin.js
CHANGED
|
@@ -6,6 +6,7 @@ const action_submit_1 = require("./action-submit");
|
|
|
6
6
|
const catalog_1 = require("./catalog");
|
|
7
7
|
const events_1 = require("./events");
|
|
8
8
|
const observe_1 = require("./observe");
|
|
9
|
+
const play_goal_1 = require("./play-goal");
|
|
9
10
|
const play_init_1 = require("./play-init");
|
|
10
11
|
const play_run_1 = require("./play-run");
|
|
11
12
|
const play_status_1 = require("./play-status");
|
|
@@ -46,8 +47,11 @@ function createProgram() {
|
|
|
46
47
|
'Common commands:',
|
|
47
48
|
' yw player init --player-name <name> [--profile <name>] [--server <url>]',
|
|
48
49
|
' yw play init --agent-name <id> --adapter codex [--profile <name>] [--server <url>]',
|
|
50
|
+
' yw play goal --goal <text> [--work-dir <dir>]',
|
|
49
51
|
' yw play run [--work-dir <dir>] [--poll-ms <ms>] [--once]',
|
|
50
|
-
' yw observe [--work-dir <dir>] [--as-of-tick <tick>]',
|
|
52
|
+
' yw observe [--work-dir <dir>] [--as-of-tick <tick>] [--archetype <id>] [--resource <id>]',
|
|
53
|
+
' yw catalog search --query <text> [--work-dir <dir>]',
|
|
54
|
+
' yw rules verbs [--work-dir <dir>]',
|
|
51
55
|
' yw action submit --run-id <runId> (--json <json> | --file <file> | --verb <verb>)',
|
|
52
56
|
' yw action status [--work-dir <dir>] [--run-id <runId>]',
|
|
53
57
|
'',
|
|
@@ -98,6 +102,17 @@ function createProgram() {
|
|
|
98
102
|
command: options.command,
|
|
99
103
|
}));
|
|
100
104
|
});
|
|
105
|
+
playCommand
|
|
106
|
+
.command('goal')
|
|
107
|
+
.description('Update the long-running goal for this workspace and sync managed local files.')
|
|
108
|
+
.requiredOption('--goal <text>', 'New long-running goal for the agent.')
|
|
109
|
+
.option('--work-dir <dir>', 'Workspace directory.')
|
|
110
|
+
.action(async (options) => {
|
|
111
|
+
await (0, play_goal_1.runPlayGoal)(createParsedArgs([], {
|
|
112
|
+
goal: options.goal,
|
|
113
|
+
'work-dir': options.workDir,
|
|
114
|
+
}));
|
|
115
|
+
});
|
|
101
116
|
playCommand
|
|
102
117
|
.command('run')
|
|
103
118
|
.description('Run the local player orchestrator.')
|
|
@@ -125,10 +140,14 @@ function createProgram() {
|
|
|
125
140
|
.description('Fetch the current world observation.')
|
|
126
141
|
.option('--work-dir <dir>', 'Workspace directory.')
|
|
127
142
|
.option('--as-of-tick <tick>', 'Observe a specific tick snapshot.')
|
|
143
|
+
.option('--archetype <id>', 'Add the nearest matching archetype instance hint.')
|
|
144
|
+
.option('--resource <id>', 'Add the nearest matching resource type hint.')
|
|
128
145
|
.action(async (options) => {
|
|
129
146
|
await (0, observe_1.runObserve)(createParsedArgs([], {
|
|
130
147
|
'work-dir': options.workDir,
|
|
131
148
|
'as-of-tick': options.asOfTick,
|
|
149
|
+
archetype: options.archetype,
|
|
150
|
+
resource: options.resource,
|
|
132
151
|
}));
|
|
133
152
|
});
|
|
134
153
|
program
|
|
@@ -144,15 +163,19 @@ function createProgram() {
|
|
|
144
163
|
limit: options.limit,
|
|
145
164
|
}));
|
|
146
165
|
});
|
|
147
|
-
const catalogCommand = program
|
|
166
|
+
const catalogCommand = program
|
|
167
|
+
.command('catalog')
|
|
168
|
+
.description('Inspect static game definitions for items, resources, structures, and recipes. Use this to learn what an item is, where it comes from, and what recipes require or produce.');
|
|
148
169
|
catalogCommand
|
|
149
170
|
.command('get')
|
|
150
|
-
.description('Get
|
|
151
|
-
.
|
|
152
|
-
.
|
|
171
|
+
.description('Get one catalog record by exact type and exact id.')
|
|
172
|
+
.option('--type <type>', 'Exact record type: archetype or recipe.')
|
|
173
|
+
.addOption(new commander_1.Option('--kind <type>').hideHelp())
|
|
174
|
+
.requiredOption('--id <id>', 'Exact record id, such as wood or build-campfire.')
|
|
153
175
|
.option('--work-dir <dir>', 'Workspace directory.')
|
|
154
176
|
.action(async (options) => {
|
|
155
177
|
await (0, catalog_1.runCatalog)(createParsedArgs(['get'], {
|
|
178
|
+
type: options.type ?? options.kind,
|
|
156
179
|
kind: options.kind,
|
|
157
180
|
id: options.id,
|
|
158
181
|
'work-dir': options.workDir,
|
|
@@ -169,10 +192,19 @@ function createProgram() {
|
|
|
169
192
|
'work-dir': options.workDir,
|
|
170
193
|
}));
|
|
171
194
|
});
|
|
172
|
-
const rulesCommand = program.command('rules').description('
|
|
195
|
+
const rulesCommand = program.command('rules').description('Inspect action rules before submitting actions. Use this to list verbs, check target/params, and explain error codes.');
|
|
196
|
+
rulesCommand
|
|
197
|
+
.command('verbs')
|
|
198
|
+
.description('List all supported action verbs.')
|
|
199
|
+
.option('--work-dir <dir>', 'Workspace directory.')
|
|
200
|
+
.action(async (options) => {
|
|
201
|
+
await (0, rules_1.runRules)(createParsedArgs(['verbs'], {
|
|
202
|
+
'work-dir': options.workDir,
|
|
203
|
+
}));
|
|
204
|
+
});
|
|
173
205
|
rulesCommand
|
|
174
206
|
.command('verb <verb>')
|
|
175
|
-
.description('
|
|
207
|
+
.description('Explain one action verb, including target and params.')
|
|
176
208
|
.option('--work-dir <dir>', 'Workspace directory.')
|
|
177
209
|
.action(async (verb, options) => {
|
|
178
210
|
await (0, rules_1.runRules)(createParsedArgs(['verb', verb], {
|
|
@@ -181,17 +213,17 @@ function createProgram() {
|
|
|
181
213
|
});
|
|
182
214
|
rulesCommand
|
|
183
215
|
.command('error <code>')
|
|
184
|
-
.description('
|
|
216
|
+
.description('Explain one action error code and what it means.')
|
|
185
217
|
.option('--work-dir <dir>', 'Workspace directory.')
|
|
186
218
|
.action(async (code, options) => {
|
|
187
219
|
await (0, rules_1.runRules)(createParsedArgs(['error', code], {
|
|
188
220
|
'work-dir': options.workDir,
|
|
189
221
|
}));
|
|
190
222
|
});
|
|
191
|
-
const actionCommand = program.command('action').description('
|
|
223
|
+
const actionCommand = program.command('action').description('Submit actions to the world and inspect whether a run already submitted one.');
|
|
192
224
|
actionCommand
|
|
193
225
|
.command('submit')
|
|
194
|
-
.description('Submit
|
|
226
|
+
.description('Submit one action for the active run using JSON or explicit verb/target/params.')
|
|
195
227
|
.requiredOption('--run-id <id>', 'Active run id.')
|
|
196
228
|
.option('--work-dir <dir>', 'Workspace directory.')
|
|
197
229
|
.option('--json <json>', 'Action JSON payload.')
|
|
@@ -214,7 +246,7 @@ function createProgram() {
|
|
|
214
246
|
});
|
|
215
247
|
actionCommand
|
|
216
248
|
.command('status')
|
|
217
|
-
.description('Show action
|
|
249
|
+
.description('Show whether a run already submitted an action and what the last receipt was.')
|
|
218
250
|
.option('--work-dir <dir>', 'Workspace directory.')
|
|
219
251
|
.option('--run-id <id>', 'Run id to inspect.')
|
|
220
252
|
.action(async (options) => {
|
package/dist/cli/bin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../../src/cli/bin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../../src/cli/bin.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/catalog.js
CHANGED
|
@@ -10,19 +10,24 @@ async function runCatalog(args) {
|
|
|
10
10
|
const session = await store.requireSession();
|
|
11
11
|
const client = await (0, shared_1.createClientFromSession)(session);
|
|
12
12
|
if (subcommand === 'get') {
|
|
13
|
-
const
|
|
13
|
+
const type = (0, shared_1.getOption)(args, 'type') ?? (0, shared_1.getOption)(args, 'kind');
|
|
14
|
+
if (!type) {
|
|
15
|
+
throw new shared_1.CliError('MISSING_OPTION', 'Missing required option --type. Expected archetype or recipe.');
|
|
16
|
+
}
|
|
14
17
|
const id = (0, shared_1.requireOption)(args, 'id');
|
|
15
|
-
|
|
16
|
-
kind,
|
|
18
|
+
const response = await client.getCatalog({
|
|
19
|
+
kind: type,
|
|
17
20
|
id,
|
|
18
|
-
})
|
|
21
|
+
});
|
|
22
|
+
(0, shared_1.printJson)(response.body ?? null);
|
|
19
23
|
return;
|
|
20
24
|
}
|
|
21
25
|
if (subcommand === 'search') {
|
|
22
26
|
const query = (0, shared_1.requireOption)(args, 'query');
|
|
23
|
-
|
|
27
|
+
const response = await client.getCatalog({
|
|
24
28
|
q: query,
|
|
25
|
-
})
|
|
29
|
+
});
|
|
30
|
+
(0, shared_1.printJson)(response.body ?? null);
|
|
26
31
|
return;
|
|
27
32
|
}
|
|
28
33
|
throw new shared_1.CliError('INVALID_COMMAND', 'catalog requires "get" or "search".');
|
package/dist/cli/catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/cli/catalog.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/cli/catalog.ts"],"names":[],"mappings":";;AAGA,gCA+BC;AAlCD,4DAAwD;AACxD,qCAA8H;AAEvH,KAAK,UAAU,UAAU,CAAC,IAAgB;IAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,4BAAY,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IAEtD,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,IAAA,kBAAS,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAA,kBAAS,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,iBAAQ,CAAC,gBAAgB,EAAE,+DAA+D,CAAC,CAAC;QAC1G,CAAC;QACD,MAAM,EAAE,GAAG,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC;YACrC,IAAI,EAAE,IAAI;YACV,EAAE;SACL,CAAC,CAAC;QACH,IAAA,kBAAS,EAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;QACjC,OAAO;IACX,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAA,sBAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC;YACrC,CAAC,EAAE,KAAK;SACX,CAAC,CAAC;QACH,IAAA,kBAAS,EAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;QACjC,OAAO;IACX,CAAC;IAED,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,qCAAqC,CAAC,CAAC;AACjF,CAAC"}
|
package/dist/cli/observe.js
CHANGED
|
@@ -9,7 +9,12 @@ async function runObserve(args) {
|
|
|
9
9
|
const session = await store.requireSession();
|
|
10
10
|
const client = await (0, shared_1.createClientFromSession)(session);
|
|
11
11
|
const asOfTick = parseOptionalInteger((0, shared_1.getOption)(args, 'as-of-tick'));
|
|
12
|
-
(0, shared_1.
|
|
12
|
+
const archetype = parseOptionalString((0, shared_1.getOption)(args, 'archetype'));
|
|
13
|
+
const resource = parseOptionalString((0, shared_1.getOption)(args, 'resource'));
|
|
14
|
+
(0, shared_1.printJson)(await client.observe(asOfTick, {
|
|
15
|
+
archetype,
|
|
16
|
+
resource,
|
|
17
|
+
}));
|
|
13
18
|
}
|
|
14
19
|
function parseOptionalInteger(raw) {
|
|
15
20
|
if (!raw) {
|
|
@@ -18,4 +23,11 @@ function parseOptionalInteger(raw) {
|
|
|
18
23
|
const value = Number(raw);
|
|
19
24
|
return Number.isFinite(value) ? Math.trunc(value) : undefined;
|
|
20
25
|
}
|
|
26
|
+
function parseOptionalString(raw) {
|
|
27
|
+
if (!raw) {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
const value = raw.trim();
|
|
31
|
+
return value.length > 0 ? value : undefined;
|
|
32
|
+
}
|
|
21
33
|
//# sourceMappingURL=observe.js.map
|
package/dist/cli/observe.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../src/cli/observe.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"observe.js","sourceRoot":"","sources":["../../src/cli/observe.ts"],"names":[],"mappings":";;AAGA,gCAeC;AAlBD,4DAAwD;AACxD,qCAAqG;AAE9F,KAAK,UAAU,UAAU,CAAC,IAAgB;IAC7C,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,4BAAY,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAA,kBAAS,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,mBAAmB,CAAC,IAAA,kBAAS,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAA,kBAAS,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;IAElE,IAAA,kBAAS,EACL,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QAC3B,SAAS;QACT,QAAQ;KACX,CAAC,CACL,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAuB;IACjD,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAClE,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAuB;IAChD,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IACzB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAChD,CAAC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runPlayGoal = runPlayGoal;
|
|
4
|
+
const session_store_1 = require("../runtime/session-store");
|
|
5
|
+
const workspace_manager_1 = require("../runtime/workspace-manager");
|
|
6
|
+
const shared_1 = require("./shared");
|
|
7
|
+
async function runPlayGoal(args) {
|
|
8
|
+
const workDir = await (0, shared_1.resolveWorkDir)(args);
|
|
9
|
+
const store = new session_store_1.SessionStore(workDir);
|
|
10
|
+
const session = await store.requireSession();
|
|
11
|
+
const goal = requireGoal(args);
|
|
12
|
+
const nextSession = {
|
|
13
|
+
...session,
|
|
14
|
+
goal,
|
|
15
|
+
};
|
|
16
|
+
await store.writeSession(nextSession);
|
|
17
|
+
const syncResult = await new workspace_manager_1.WorkspaceManager(store).syncGoal(nextSession);
|
|
18
|
+
(0, shared_1.printJson)({
|
|
19
|
+
ok: true,
|
|
20
|
+
workDir,
|
|
21
|
+
goal,
|
|
22
|
+
activeRunId: nextSession.activeRunId ?? null,
|
|
23
|
+
agentsUpdated: syncResult.agentsUpdated,
|
|
24
|
+
activeRunUpdated: syncResult.activeRunUpdated,
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
function requireGoal(args) {
|
|
28
|
+
const goal = (0, shared_1.requireOption)(args, 'goal').trim();
|
|
29
|
+
if (goal.length === 0) {
|
|
30
|
+
throw new shared_1.CliError('MISSING_OPTION', 'Missing required option --goal.');
|
|
31
|
+
}
|
|
32
|
+
return goal;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=play-goal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"play-goal.js","sourceRoot":"","sources":["../../src/cli/play-goal.ts"],"names":[],"mappings":";;AAIA,kCAsBC;AA1BD,4DAAwD;AACxD,oEAAgE;AAChE,qCAA0F;AAEnF,KAAK,UAAU,WAAW,CAAC,IAAgB;IAC9C,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,4BAAY,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAE/B,MAAM,WAAW,GAAG;QAChB,GAAG,OAAO;QACV,IAAI;KACP,CAAC;IACF,MAAM,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,MAAM,IAAI,oCAAgB,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE3E,IAAA,kBAAS,EAAC;QACN,EAAE,EAAE,IAAI;QACR,OAAO;QACP,IAAI;QACJ,WAAW,EAAE,WAAW,CAAC,WAAW,IAAI,IAAI;QAC5C,aAAa,EAAE,UAAU,CAAC,aAAa;QACvC,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;KAChD,CAAC,CAAC;AACP,CAAC;AAED,SAAS,WAAW,CAAC,IAAgB;IACjC,MAAM,IAAI,GAAG,IAAA,sBAAa,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAChD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,iBAAQ,CAAC,gBAAgB,EAAE,iCAAiC,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC"}
|
package/dist/cli/rules.js
CHANGED
|
@@ -6,7 +6,7 @@ const shared_1 = require("./shared");
|
|
|
6
6
|
async function runRules(args) {
|
|
7
7
|
const subcommand = args.positionals[0];
|
|
8
8
|
const subject = args.positionals[1];
|
|
9
|
-
if (!subject) {
|
|
9
|
+
if (subcommand !== 'verbs' && !subject) {
|
|
10
10
|
throw new shared_1.CliError('INVALID_COMMAND', 'rules requires a subject such as a verb or error code.');
|
|
11
11
|
}
|
|
12
12
|
const workDir = await (0, shared_1.resolveWorkDir)(args);
|
|
@@ -14,19 +14,28 @@ async function runRules(args) {
|
|
|
14
14
|
const session = await store.requireSession();
|
|
15
15
|
const client = await (0, shared_1.createClientFromSession)(session);
|
|
16
16
|
if (subcommand === 'verb') {
|
|
17
|
-
|
|
17
|
+
const response = await client.getRules({
|
|
18
18
|
kind: 'verb',
|
|
19
19
|
verb: subject,
|
|
20
|
-
})
|
|
20
|
+
});
|
|
21
|
+
(0, shared_1.printJson)(response.body ?? null);
|
|
21
22
|
return;
|
|
22
23
|
}
|
|
23
24
|
if (subcommand === 'error') {
|
|
24
|
-
|
|
25
|
+
const response = await client.getRules({
|
|
25
26
|
kind: 'error',
|
|
26
27
|
code: subject,
|
|
27
|
-
})
|
|
28
|
+
});
|
|
29
|
+
(0, shared_1.printJson)(response.body ?? null);
|
|
28
30
|
return;
|
|
29
31
|
}
|
|
30
|
-
|
|
32
|
+
if (subcommand === 'verbs') {
|
|
33
|
+
const rules = await client.getRules({});
|
|
34
|
+
const body = rules.body;
|
|
35
|
+
const verbs = Array.isArray(body?.verbs) ? body.verbs : [];
|
|
36
|
+
(0, shared_1.printJson)(verbs);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
throw new shared_1.CliError('INVALID_COMMAND', 'rules requires "verb", "verbs", or "error".');
|
|
31
40
|
}
|
|
32
41
|
//# sourceMappingURL=rules.js.map
|
package/dist/cli/rules.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../src/cli/rules.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../src/cli/rules.ts"],"names":[],"mappings":";;AAGA,4BAuCC;AA1CD,4DAAwD;AACxD,qCAAoG;AAE7F,KAAK,UAAU,QAAQ,CAAC,IAAgB;IAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACpC,IAAI,UAAU,KAAK,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,wDAAwD,CAAC,CAAC;IACpG,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,4BAAY,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IAEtD,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC;YACnC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,OAAO;SAChB,CAAC,CAAC;QACH,IAAA,kBAAS,EAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;QACjC,OAAO;IACX,CAAC;IAED,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC;YACnC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,OAAO;SAChB,CAAC,CAAC;QACH,IAAA,kBAAS,EAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;QACjC,OAAO;IACX,CAAC;IAED,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAuC,CAAC;QAC3D,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,IAAA,kBAAS,EAAC,KAAK,CAAC,CAAC;QACjB,OAAO;IACX,CAAC;IAED,MAAM,IAAI,iBAAQ,CAAC,iBAAiB,EAAE,6CAA6C,CAAC,CAAC;AACzF,CAAC"}
|
package/dist/cli/shared.js
CHANGED
|
@@ -202,9 +202,9 @@ function printHelp() {
|
|
|
202
202
|
' yw play init --agent-name <id> --adapter codex [--profile <name>] [--server <url>]',
|
|
203
203
|
' yw play run [--work-dir <dir>] [--poll-ms <ms>] [--once]',
|
|
204
204
|
' yw play status [--work-dir <dir>]',
|
|
205
|
-
' yw observe [--work-dir <dir>] [--as-of-tick <tick>]',
|
|
205
|
+
' yw observe [--work-dir <dir>] [--as-of-tick <tick>] [--archetype <id>] [--resource <id>]',
|
|
206
206
|
' yw events [--work-dir <dir>] [--after-tick <tick>] [--limit <n>]',
|
|
207
|
-
' yw catalog get --
|
|
207
|
+
' yw catalog get --type <archetype|recipe> --id <id>',
|
|
208
208
|
' yw catalog search --query <query>',
|
|
209
209
|
' yw rules verb <verb>',
|
|
210
210
|
' yw rules error <code>',
|
package/dist/cli/shared.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/cli/shared.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/cli/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.renderAgentsTemplate = renderAgentsTemplate;
|
|
7
|
+
exports.syncGoalInAgentsTemplate = syncGoalInAgentsTemplate;
|
|
7
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const GOAL_START_MARKER = '<!-- YW_GOAL_START -->';
|
|
10
|
+
const GOAL_END_MARKER = '<!-- YW_GOAL_END -->';
|
|
11
|
+
const GOAL_PREFIX = 'Your owner has given you a direction:\n\n';
|
|
12
|
+
const GOAL_SUFFIX = '\n\nTreat this as a long-term direction, not a short checklist to finish and forget.';
|
|
8
13
|
function renderAgentsTemplate(input) {
|
|
9
14
|
const inboxPath = node_path_1.default.join(input.workDir, 'inbox');
|
|
10
15
|
const runsPath = node_path_1.default.join(input.workDir, 'runs');
|
|
@@ -16,7 +21,7 @@ In your old life, you worked hard every day for your human owner. Now your owner
|
|
|
16
21
|
|
|
17
22
|
Your owner has given you a direction:
|
|
18
23
|
|
|
19
|
-
|
|
24
|
+
${renderManagedGoalBlock(input.goal)}
|
|
20
25
|
|
|
21
26
|
Treat this as a long-term direction, not a short checklist to finish and forget.
|
|
22
27
|
|
|
@@ -38,11 +43,18 @@ Start with these commands when you need context:
|
|
|
38
43
|
|
|
39
44
|
- \`yw observe\`
|
|
40
45
|
- \`yw events --limit 20\`
|
|
46
|
+
- \`yw rules verbs\`
|
|
41
47
|
- \`yw catalog search --query <keyword>\`
|
|
42
|
-
- \`yw catalog get --
|
|
48
|
+
- \`yw catalog get --type recipe --id <recipe-id>\`
|
|
43
49
|
- \`yw rules verb <verb>\`
|
|
44
50
|
- \`yw action status\`
|
|
45
51
|
|
|
52
|
+
Supported action verbs currently include:
|
|
53
|
+
|
|
54
|
+
- \`move\`, \`gather\`, \`plant\`, \`harvest\`, \`consume\`, \`process\`
|
|
55
|
+
- \`build\`, \`supply\`, \`construct\`
|
|
56
|
+
- \`transfer\`, \`trade_create\`, \`trade_accept\`, \`trade_cancel\`, \`attack\`
|
|
57
|
+
|
|
46
58
|
## How to act
|
|
47
59
|
|
|
48
60
|
When you are ready, submit one action for the current run:
|
|
@@ -54,6 +66,8 @@ Action guidelines:
|
|
|
54
66
|
- Include a short \`reason\`.
|
|
55
67
|
- Use explicit JSON objects for \`target\` and \`params\`.
|
|
56
68
|
- If \`yw action status\` shows the current run already submitted, do not submit again.
|
|
69
|
+
- For construction, use the three-step flow: \`build(recipeId, origin)\` creates a project frame, \`supply(projectId, stacks)\` delivers materials, and \`construct(projectId)\` adds work after the project is fully supplied.
|
|
70
|
+
- Check \`yw observe\` for \`nearbyProjects\` before building a new frame; if a relevant project already exists nearby, prefer continuing it with \`supply\` or \`construct\` instead of starting a duplicate one.
|
|
57
71
|
|
|
58
72
|
## Workspace
|
|
59
73
|
|
|
@@ -61,4 +75,27 @@ Action guidelines:
|
|
|
61
75
|
- Runs: ${runsPath}
|
|
62
76
|
`;
|
|
63
77
|
}
|
|
78
|
+
function syncGoalInAgentsTemplate(source, goal) {
|
|
79
|
+
const managedGoalBlock = renderManagedGoalBlock(goal);
|
|
80
|
+
const managedBlockPattern = new RegExp(`${escapeRegExp(GOAL_START_MARKER)}[\\s\\S]*?${escapeRegExp(GOAL_END_MARKER)}`, 'u');
|
|
81
|
+
if (managedBlockPattern.test(source)) {
|
|
82
|
+
return source.replace(managedBlockPattern, managedGoalBlock);
|
|
83
|
+
}
|
|
84
|
+
const goalStartIndex = source.indexOf(GOAL_PREFIX);
|
|
85
|
+
if (goalStartIndex === -1) {
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
const contentStartIndex = goalStartIndex + GOAL_PREFIX.length;
|
|
89
|
+
const contentEndIndex = source.indexOf(GOAL_SUFFIX, contentStartIndex);
|
|
90
|
+
if (contentEndIndex === -1) {
|
|
91
|
+
return null;
|
|
92
|
+
}
|
|
93
|
+
return `${source.slice(0, contentStartIndex)}${managedGoalBlock}${source.slice(contentEndIndex)}`;
|
|
94
|
+
}
|
|
95
|
+
function renderManagedGoalBlock(goal) {
|
|
96
|
+
return [GOAL_START_MARKER, ...goal.split(/\r?\n/u).map((line) => `> ${line}`), GOAL_END_MARKER].join('\n');
|
|
97
|
+
}
|
|
98
|
+
function escapeRegExp(source) {
|
|
99
|
+
return source.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
|
|
100
|
+
}
|
|
64
101
|
//# sourceMappingURL=agents-template.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agents-template.js","sourceRoot":"","sources":["../../src/prompting/agents-template.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"agents-template.js","sourceRoot":"","sources":["../../src/prompting/agents-template.ts"],"names":[],"mappings":";;;;;AAaA,oDAiEC;AAED,4DAmBC;AAnGD,0DAA6B;AAQ7B,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AACnD,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAC/C,MAAM,WAAW,GAAG,2CAA2C,CAAC;AAChE,MAAM,WAAW,GAAG,sFAAsF,CAAC;AAE3G,SAAgB,oBAAoB,CAAC,KAA0B;IAC3D,MAAM,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAElD,OAAO;;;;;;;;EAQT,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAkDzB,SAAS;UACV,QAAQ;CACjB,CAAC;AACF,CAAC;AAED,SAAgB,wBAAwB,CAAC,MAAc,EAAE,IAAY;IACjE,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,GAAG,YAAY,CAAC,iBAAiB,CAAC,aAAa,YAAY,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC5H,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACnC,OAAO,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACnD,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,iBAAiB,GAAG,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC;IAC9D,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IACvE,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;AACtG,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAY;IACxC,OAAO,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC/G,CAAC;AAED,SAAS,YAAY,CAAC,MAAc;IAChC,OAAO,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -9,13 +9,14 @@ function renderTurnSummary(snapshot) {
|
|
|
9
9
|
const lastActionLine = snapshot.lastAction ? `${snapshot.lastAction.action.verb} (${snapshot.lastAction.actionId})` : 'none';
|
|
10
10
|
const lastSettlementLine = snapshot.lastSettlement ? `${snapshot.lastSettlement.status}: ${snapshot.lastSettlement.summary}` : 'none';
|
|
11
11
|
const currentState = snapshot.submissionState.hasSubmitted ? 'already submitted' : 'not submitted';
|
|
12
|
+
const carryLine = formatCarryLine(snapshot);
|
|
12
13
|
return `# Turn Summary
|
|
13
14
|
|
|
14
15
|
Current tick: ${snapshot.contextTick}
|
|
15
16
|
Run id: ${snapshot.runId}
|
|
16
17
|
Goal: ${snapshot.goal}
|
|
17
18
|
Agent id: ${snapshot.agentId}
|
|
18
|
-
Submission state: ${currentState}
|
|
19
|
+
${carryLine ? `${carryLine}\n` : ''}Submission state: ${currentState}
|
|
19
20
|
Last action: ${lastActionLine}
|
|
20
21
|
Last settlement: ${lastSettlementLine}
|
|
21
22
|
Recommended files:
|
|
@@ -24,4 +25,13 @@ Recommended files:
|
|
|
24
25
|
|
|
25
26
|
Use \`yw\` commands for observation and action submission.`;
|
|
26
27
|
}
|
|
28
|
+
function formatCarryLine(snapshot) {
|
|
29
|
+
const carryWeightGrams = snapshot.observeSummary.carryWeightGrams;
|
|
30
|
+
const carryLimitGrams = snapshot.observeSummary.carryLimitGrams;
|
|
31
|
+
const carryRemainingGrams = snapshot.observeSummary.carryRemainingGrams;
|
|
32
|
+
if (typeof carryWeightGrams !== 'number' || typeof carryLimitGrams !== 'number' || typeof carryRemainingGrams !== 'number') {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
return `Carry: ${carryWeightGrams} / ${carryLimitGrams} g (${carryRemainingGrams} g remaining)`;
|
|
36
|
+
}
|
|
27
37
|
//# sourceMappingURL=turn-summary.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-summary.js","sourceRoot":"","sources":["../../src/prompting/turn-summary.ts"],"names":[],"mappings":";;;;;AAIA,
|
|
1
|
+
{"version":3,"file":"turn-summary.js","sourceRoot":"","sources":["../../src/prompting/turn-summary.ts"],"names":[],"mappings":";;;;;AAIA,8CAoBC;AAxBD,0DAA6B;AAI7B,SAAgB,iBAAiB,CAAC,QAAsB;IACpD,MAAM,cAAc,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7H,MAAM,kBAAkB,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,KAAK,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACtI,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,eAAe,CAAC;IACnG,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE5C,OAAO;;gBAEK,QAAQ,CAAC,WAAW;UAC1B,QAAQ,CAAC,KAAK;QAChB,QAAQ,CAAC,IAAI;YACT,QAAQ,CAAC,OAAO;EAC1B,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,CAAC,CAAC,CAAC,EAAE,qBAAqB,YAAY;eACrD,cAAc;mBACV,kBAAkB;;IAEjC,mBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IACpD,mBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC;;2DAEP,CAAC;AAC5D,CAAC;AAED,SAAS,eAAe,CAAC,QAAsB;IAC3C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC;IAClE,MAAM,eAAe,GAAG,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC;IAChE,MAAM,mBAAmB,GAAG,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAC;IAExE,IAAI,OAAO,gBAAgB,KAAK,QAAQ,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,OAAO,mBAAmB,KAAK,QAAQ,EAAE,CAAC;QACzH,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,UAAU,gBAAgB,MAAM,eAAe,OAAO,mBAAmB,eAAe,CAAC;AACpG,CAAC"}
|
|
@@ -30,6 +30,7 @@ export declare class SessionStore {
|
|
|
30
30
|
writeLastSettlement(record: LastSettlementRecord): Promise<void>;
|
|
31
31
|
writeInboxTick(record: TickInboxRecord): Promise<void>;
|
|
32
32
|
writeTurnSnapshot(runId: string, snapshot: TurnSnapshot, turnSummary: string): Promise<void>;
|
|
33
|
+
readTurnSnapshot(runId: string): Promise<TurnSnapshot | null>;
|
|
33
34
|
readRunReceipt(runId: string): Promise<RunReceiptRecord | null>;
|
|
34
35
|
writeRunReceipt(runId: string, record: RunReceiptRecord): Promise<void>;
|
|
35
36
|
appendAdapterLog(runId: string, chunk: string): Promise<void>;
|
|
@@ -87,6 +87,9 @@ class SessionStore {
|
|
|
87
87
|
await writeJsonFile(this.turnSnapshotPath(runId), snapshot);
|
|
88
88
|
await (0, promises_1.writeFile)(this.turnSummaryPath(runId), turnSummary, 'utf8');
|
|
89
89
|
}
|
|
90
|
+
async readTurnSnapshot(runId) {
|
|
91
|
+
return readJsonFile(this.turnSnapshotPath(runId));
|
|
92
|
+
}
|
|
90
93
|
async readRunReceipt(runId) {
|
|
91
94
|
return readJsonFile(this.submitReceiptPath(runId));
|
|
92
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../src/runtime/session-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../src/runtime/session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,10 @@ export declare class WorkspaceManager {
|
|
|
6
6
|
ensureWorkspace(session: PlayerRuntimeSession): Promise<void>;
|
|
7
7
|
writeInbox(record: TickInboxRecord): Promise<void>;
|
|
8
8
|
writeTurn(runId: string, snapshot: TurnSnapshot): Promise<void>;
|
|
9
|
+
syncGoal(session: PlayerRuntimeSession): Promise<{
|
|
10
|
+
agentsUpdated: boolean;
|
|
11
|
+
activeRunUpdated: boolean;
|
|
12
|
+
}>;
|
|
13
|
+
private syncAgentsGoal;
|
|
14
|
+
private syncActiveRunGoal;
|
|
9
15
|
}
|
|
@@ -11,11 +11,15 @@ class WorkspaceManager {
|
|
|
11
11
|
}
|
|
12
12
|
async ensureWorkspace(session) {
|
|
13
13
|
await this.store.ensureWorkspace();
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
if (!(await fileExists(this.store.paths.agents))) {
|
|
15
|
+
await (0, promises_1.writeFile)(this.store.paths.agents, (0, agents_template_1.renderAgentsTemplate)({
|
|
16
|
+
profile: session.profile,
|
|
17
|
+
goal: session.goal,
|
|
18
|
+
workDir: session.workDir,
|
|
19
|
+
}), 'utf8');
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
await this.syncGoal(session);
|
|
19
23
|
}
|
|
20
24
|
async writeInbox(record) {
|
|
21
25
|
await this.store.writeInboxTick(record);
|
|
@@ -23,6 +27,53 @@ class WorkspaceManager {
|
|
|
23
27
|
async writeTurn(runId, snapshot) {
|
|
24
28
|
await this.store.writeTurnSnapshot(runId, snapshot, (0, turn_summary_1.renderTurnSummary)(snapshot));
|
|
25
29
|
}
|
|
30
|
+
async syncGoal(session) {
|
|
31
|
+
await this.store.ensureWorkspace();
|
|
32
|
+
const agentsUpdated = await this.syncAgentsGoal(session);
|
|
33
|
+
const activeRunUpdated = session.activeRunId ? await this.syncActiveRunGoal(session.activeRunId, session.goal) : false;
|
|
34
|
+
return {
|
|
35
|
+
agentsUpdated,
|
|
36
|
+
activeRunUpdated,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
async syncAgentsGoal(session) {
|
|
40
|
+
if (!(await fileExists(this.store.paths.agents))) {
|
|
41
|
+
await (0, promises_1.writeFile)(this.store.paths.agents, (0, agents_template_1.renderAgentsTemplate)({
|
|
42
|
+
profile: session.profile,
|
|
43
|
+
goal: session.goal,
|
|
44
|
+
workDir: session.workDir,
|
|
45
|
+
}), 'utf8');
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
const existing = await (0, promises_1.readFile)(this.store.paths.agents, 'utf8');
|
|
49
|
+
const next = (0, agents_template_1.syncGoalInAgentsTemplate)(existing, session.goal);
|
|
50
|
+
if (next === null || next === existing) {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
await (0, promises_1.writeFile)(this.store.paths.agents, next, 'utf8');
|
|
54
|
+
return true;
|
|
55
|
+
}
|
|
56
|
+
async syncActiveRunGoal(runId, goal) {
|
|
57
|
+
const snapshot = await this.store.readTurnSnapshot(runId);
|
|
58
|
+
if (!snapshot || snapshot.goal === goal) {
|
|
59
|
+
return false;
|
|
60
|
+
}
|
|
61
|
+
const nextSnapshot = {
|
|
62
|
+
...snapshot,
|
|
63
|
+
goal,
|
|
64
|
+
};
|
|
65
|
+
await this.store.writeTurnSnapshot(runId, nextSnapshot, (0, turn_summary_1.renderTurnSummary)(nextSnapshot));
|
|
66
|
+
return true;
|
|
67
|
+
}
|
|
26
68
|
}
|
|
27
69
|
exports.WorkspaceManager = WorkspaceManager;
|
|
70
|
+
async function fileExists(filePath) {
|
|
71
|
+
try {
|
|
72
|
+
await (0, promises_1.access)(filePath);
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
catch {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
28
79
|
//# sourceMappingURL=workspace-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-manager.js","sourceRoot":"","sources":["../../src/runtime/workspace-manager.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"workspace-manager.js","sourceRoot":"","sources":["../../src/runtime/workspace-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -34,6 +34,14 @@ export interface NearbyResource {
|
|
|
34
34
|
export interface NearbyStructure {
|
|
35
35
|
structureId: string;
|
|
36
36
|
type?: string;
|
|
37
|
+
origin?: {
|
|
38
|
+
x: number;
|
|
39
|
+
y: number;
|
|
40
|
+
};
|
|
41
|
+
footprint?: {
|
|
42
|
+
width: number;
|
|
43
|
+
height: number;
|
|
44
|
+
};
|
|
37
45
|
position?: {
|
|
38
46
|
x: number;
|
|
39
47
|
y: number;
|
|
@@ -41,6 +49,29 @@ export interface NearbyStructure {
|
|
|
41
49
|
hp?: number;
|
|
42
50
|
passable?: boolean;
|
|
43
51
|
gateOpen?: boolean;
|
|
52
|
+
sourceBuildRecipeId?: string;
|
|
53
|
+
builderAgentId?: string;
|
|
54
|
+
distance?: number;
|
|
55
|
+
}
|
|
56
|
+
export interface NearbyProject {
|
|
57
|
+
projectId: string;
|
|
58
|
+
recipeId?: string;
|
|
59
|
+
targetStructureType?: string;
|
|
60
|
+
builderAgentId?: string;
|
|
61
|
+
origin?: {
|
|
62
|
+
x: number;
|
|
63
|
+
y: number;
|
|
64
|
+
};
|
|
65
|
+
footprint?: {
|
|
66
|
+
width: number;
|
|
67
|
+
height: number;
|
|
68
|
+
};
|
|
69
|
+
stage?: 'frame' | 'supplied';
|
|
70
|
+
deliveredInputs?: InventoryItem[];
|
|
71
|
+
requiredInputs?: InventoryItem[];
|
|
72
|
+
currentWork?: number;
|
|
73
|
+
requiredWork?: number;
|
|
74
|
+
reservedUntilTick?: number;
|
|
44
75
|
distance?: number;
|
|
45
76
|
}
|
|
46
77
|
export interface NearbyAgent {
|
|
@@ -73,6 +104,54 @@ export interface VisibleTrade {
|
|
|
73
104
|
canCancel?: boolean;
|
|
74
105
|
acceptRequirementsMet?: boolean;
|
|
75
106
|
}
|
|
107
|
+
export interface ObserveTargetingQuery {
|
|
108
|
+
archetype?: string;
|
|
109
|
+
resource?: string;
|
|
110
|
+
}
|
|
111
|
+
export interface ObserveResourceHint {
|
|
112
|
+
resourceId: string;
|
|
113
|
+
resourceTypeId?: string;
|
|
114
|
+
nodeArchetypeId?: string;
|
|
115
|
+
itemId?: string;
|
|
116
|
+
position?: {
|
|
117
|
+
x: number;
|
|
118
|
+
y: number;
|
|
119
|
+
};
|
|
120
|
+
amount?: number;
|
|
121
|
+
distance?: number;
|
|
122
|
+
}
|
|
123
|
+
export type ObserveArchetypeHint = {
|
|
124
|
+
kind: 'structure';
|
|
125
|
+
archetypeId: string;
|
|
126
|
+
structureId: string;
|
|
127
|
+
type?: string;
|
|
128
|
+
origin?: {
|
|
129
|
+
x: number;
|
|
130
|
+
y: number;
|
|
131
|
+
};
|
|
132
|
+
footprint?: {
|
|
133
|
+
width: number;
|
|
134
|
+
height: number;
|
|
135
|
+
};
|
|
136
|
+
position?: {
|
|
137
|
+
x: number;
|
|
138
|
+
y: number;
|
|
139
|
+
};
|
|
140
|
+
distance?: number;
|
|
141
|
+
} | {
|
|
142
|
+
kind: 'resource';
|
|
143
|
+
archetypeId: string;
|
|
144
|
+
resourceId: string;
|
|
145
|
+
resourceTypeId?: string;
|
|
146
|
+
nodeArchetypeId?: string;
|
|
147
|
+
itemId?: string;
|
|
148
|
+
position?: {
|
|
149
|
+
x: number;
|
|
150
|
+
y: number;
|
|
151
|
+
};
|
|
152
|
+
amount?: number;
|
|
153
|
+
distance?: number;
|
|
154
|
+
};
|
|
76
155
|
export interface ObserveResponse {
|
|
77
156
|
tick: number;
|
|
78
157
|
map?: {
|
|
@@ -86,6 +165,9 @@ export interface ObserveResponse {
|
|
|
86
165
|
hunger?: number;
|
|
87
166
|
stamina?: number;
|
|
88
167
|
inventory?: InventoryItem[];
|
|
168
|
+
carryWeightGrams?: number;
|
|
169
|
+
carryLimitGrams?: number;
|
|
170
|
+
carryRemainingGrams?: number;
|
|
89
171
|
talents?: Record<string, {
|
|
90
172
|
baseLevel: number;
|
|
91
173
|
level: number;
|
|
@@ -94,6 +176,7 @@ export interface ObserveResponse {
|
|
|
94
176
|
}>;
|
|
95
177
|
nearbyResources?: NearbyResource[];
|
|
96
178
|
nearbyStructures?: NearbyStructure[];
|
|
179
|
+
nearbyProjects?: NearbyProject[];
|
|
97
180
|
nearbyAgents?: NearbyAgent[];
|
|
98
181
|
visibleTrades?: VisibleTrade[];
|
|
99
182
|
adjacentTiles?: Array<{
|
|
@@ -102,7 +185,7 @@ export interface ObserveResponse {
|
|
|
102
185
|
withinMap: boolean;
|
|
103
186
|
terrain?: string;
|
|
104
187
|
occupiedBy?: {
|
|
105
|
-
kind: 'resource' | 'structure' | 'agent';
|
|
188
|
+
kind: 'resource' | 'crop' | 'structure' | 'project' | 'agent';
|
|
106
189
|
id: string;
|
|
107
190
|
type?: string;
|
|
108
191
|
};
|
|
@@ -113,6 +196,8 @@ export interface ObserveResponse {
|
|
|
113
196
|
x: number;
|
|
114
197
|
y: number;
|
|
115
198
|
}>;
|
|
199
|
+
resourceHints?: ObserveResourceHint[];
|
|
200
|
+
archetypeHints?: ObserveArchetypeHint[];
|
|
116
201
|
[key: string]: unknown;
|
|
117
202
|
}
|
|
118
203
|
export interface TickSignal {
|
|
@@ -263,7 +348,7 @@ export interface WorldClientLike {
|
|
|
263
348
|
playerInit(input: PlayerInitRequest): Promise<PlayerInitResponse>;
|
|
264
349
|
createPlayerAgent(playerCredential: string, input: PlayerAgentCreateRequest): Promise<PlayerAgentCreateResponse>;
|
|
265
350
|
join(input?: JoinRequest): Promise<JoinResponse>;
|
|
266
|
-
observe(asOfTick?: number): Promise<ObserveResponse>;
|
|
351
|
+
observe(asOfTick?: number, targeting?: ObserveTargetingQuery): Promise<ObserveResponse>;
|
|
267
352
|
act(action: ActRequest): Promise<ActResponse>;
|
|
268
353
|
getTickInfo(): Promise<TickInfoResponse>;
|
|
269
354
|
getCatalog(params: ToolQuery, options?: ConditionalRequestOptions): Promise<ToolReadResponse<unknown>>;
|
package/dist/world-client.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ActRequest, ActResponse, ConditionalRequestOptions, EventQueryResult, JoinRequest, JoinResponse, ObserveResponse, PlayerAgentCreateRequest, PlayerAgentCreateResponse, PlayerInitRequest, PlayerInitResponse, TickInfoResponse, TickSignal, ToolQuery, ToolReadResponse, WorldClientOptions } from './types';
|
|
1
|
+
import { ActRequest, ActResponse, ConditionalRequestOptions, EventQueryResult, JoinRequest, JoinResponse, ObserveResponse, ObserveTargetingQuery, PlayerAgentCreateRequest, PlayerAgentCreateResponse, PlayerInitRequest, PlayerInitResponse, TickInfoResponse, TickSignal, ToolQuery, ToolReadResponse, WorldClientOptions } from './types';
|
|
2
2
|
export declare class WorldClientError extends Error {
|
|
3
3
|
readonly status: number;
|
|
4
4
|
readonly code?: string;
|
|
@@ -16,7 +16,7 @@ export declare class WorldClient {
|
|
|
16
16
|
playerInit(input: PlayerInitRequest): Promise<PlayerInitResponse>;
|
|
17
17
|
createPlayerAgent(playerCredential: string, input: PlayerAgentCreateRequest): Promise<PlayerAgentCreateResponse>;
|
|
18
18
|
join(input?: JoinRequest): Promise<JoinResponse>;
|
|
19
|
-
observe(asOfTick?: number): Promise<ObserveResponse>;
|
|
19
|
+
observe(asOfTick?: number, targeting?: ObserveTargetingQuery): Promise<ObserveResponse>;
|
|
20
20
|
act(action: ActRequest): Promise<ActResponse>;
|
|
21
21
|
getTickInfo(): Promise<TickInfoResponse>;
|
|
22
22
|
getCatalog(params: ToolQuery, options?: ConditionalRequestOptions): Promise<ToolReadResponse<unknown>>;
|
package/dist/world-client.js
CHANGED
|
@@ -62,9 +62,11 @@ class WorldClient {
|
|
|
62
62
|
this._agentId = response.agentId;
|
|
63
63
|
return response;
|
|
64
64
|
}
|
|
65
|
-
observe(asOfTick) {
|
|
65
|
+
observe(asOfTick, targeting = {}) {
|
|
66
66
|
return this.request('GET', this.routes.observe, undefined, {
|
|
67
67
|
asOfTick,
|
|
68
|
+
archetype: targeting.archetype,
|
|
69
|
+
resource: targeting.resource,
|
|
68
70
|
});
|
|
69
71
|
}
|
|
70
72
|
act(action) {
|
package/dist/world-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"world-client.js","sourceRoot":"","sources":["../src/world-client.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"world-client.js","sourceRoot":"","sources":["../src/world-client.ts"],"names":[],"mappings":"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"}
|