@your-world/cli 0.1.9 → 0.1.11
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/play-status.js +20 -2
- package/dist/cli/play-status.js.map +1 -1
- package/dist/cli/shared.js +14 -1
- package/dist/cli/shared.js.map +1 -1
- package/dist/prompting/agents-template.d.ts +1 -1
- package/dist/prompting/agents-template.js +43 -1
- package/dist/prompting/agents-template.js.map +1 -1
- package/dist/runtime/workspace-manager.js +1 -1
- package/dist/runtime/workspace-manager.js.map +1 -1
- package/package.json +1 -1
package/dist/cli/play-status.js
CHANGED
|
@@ -2,18 +2,36 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.runPlayStatus = runPlayStatus;
|
|
4
4
|
const session_store_1 = require("../runtime/session-store");
|
|
5
|
+
const world_client_1 = require("../world-client");
|
|
5
6
|
const shared_1 = require("./shared");
|
|
6
7
|
async function runPlayStatus(args) {
|
|
7
8
|
const workDir = await (0, shared_1.resolveWorkDir)(args);
|
|
8
9
|
const store = new session_store_1.SessionStore(workDir);
|
|
9
10
|
const session = await store.requireSession();
|
|
10
11
|
const client = await (0, shared_1.createClientFromSession)(session);
|
|
11
|
-
const [lastAction, lastSettlement,
|
|
12
|
+
const [lastAction, lastSettlement, tickInfoResult] = await Promise.all([store.readLastAction(), store.readLastSettlement(), readTickInfoBestEffort(client)]);
|
|
12
13
|
(0, shared_1.printJson)({
|
|
13
14
|
session,
|
|
14
|
-
tickInfo,
|
|
15
|
+
tickInfo: tickInfoResult.tickInfo,
|
|
16
|
+
...(tickInfoResult.error ? { tickInfoError: tickInfoResult.error } : {}),
|
|
15
17
|
lastAction,
|
|
16
18
|
lastSettlement,
|
|
17
19
|
});
|
|
18
20
|
}
|
|
21
|
+
async function readTickInfoBestEffort(client) {
|
|
22
|
+
try {
|
|
23
|
+
return {
|
|
24
|
+
tickInfo: await client.getTickInfo(),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
if (error instanceof world_client_1.WorldClientError) {
|
|
29
|
+
return {
|
|
30
|
+
tickInfo: null,
|
|
31
|
+
error: error.message,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
throw error;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
19
37
|
//# sourceMappingURL=play-status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"play-status.js","sourceRoot":"","sources":["../../src/cli/play-status.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"play-status.js","sourceRoot":"","sources":["../../src/cli/play-status.ts"],"names":[],"mappings":";;AAKA,sCAcC;AAnBD,4DAAwD;AAExD,kDAAmD;AACnD,qCAA0F;AAEnF,KAAK,UAAU,aAAa,CAAC,IAAgB;IAChD,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,CAAC,UAAU,EAAE,cAAc,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,KAAK,CAAC,kBAAkB,EAAE,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE7J,IAAA,kBAAS,EAAC;QACN,OAAO;QACP,QAAQ,EAAE,cAAc,CAAC,QAAQ;QACjC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,UAAU;QACV,cAAc;KACjB,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,MAA2D;IAC7F,IAAI,CAAC;QACD,OAAO;YACH,QAAQ,EAAE,MAAM,MAAM,CAAC,WAAW,EAAE;SACvC,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,+BAAgB,EAAE,CAAC;YACpC,OAAO;gBACH,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC;QACN,CAAC;QAED,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC"}
|
package/dist/cli/shared.js
CHANGED
|
@@ -161,6 +161,7 @@ async function findWorkspaceChildSessionWorkDir(startDir, profile) {
|
|
|
161
161
|
}
|
|
162
162
|
async function createClientFromSession(session) {
|
|
163
163
|
let token;
|
|
164
|
+
const agentId = resolveAgentIdForSession(session);
|
|
164
165
|
if (session.credentialRef) {
|
|
165
166
|
const credentialStore = new credential_store_1.CredentialStore();
|
|
166
167
|
const credential = await credentialStore.getAgentCredential(session.serverUrl, session.credentialRef);
|
|
@@ -171,7 +172,7 @@ async function createClientFromSession(session) {
|
|
|
171
172
|
}
|
|
172
173
|
return new world_client_1.WorldClient({
|
|
173
174
|
baseUrl: session.serverUrl,
|
|
174
|
-
|
|
175
|
+
...(0, optional_prop_1.optionalProp)('agentId', agentId),
|
|
175
176
|
...(0, optional_prop_1.optionalProp)('token', token),
|
|
176
177
|
});
|
|
177
178
|
}
|
|
@@ -224,6 +225,18 @@ function printHelp() {
|
|
|
224
225
|
function createLogger() {
|
|
225
226
|
return new logger_1.ConsoleLogger();
|
|
226
227
|
}
|
|
228
|
+
function resolveAgentIdForSession(session) {
|
|
229
|
+
if (typeof session.agentId === 'string' && session.agentId.trim().length > 0) {
|
|
230
|
+
return session.agentId;
|
|
231
|
+
}
|
|
232
|
+
if (typeof session.credentialRef === 'string' && session.credentialRef.startsWith('agent:')) {
|
|
233
|
+
const derivedAgentId = session.credentialRef.slice('agent:'.length).trim();
|
|
234
|
+
if (derivedAgentId.length > 0) {
|
|
235
|
+
return derivedAgentId;
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
return undefined;
|
|
239
|
+
}
|
|
227
240
|
function asStringArray(value) {
|
|
228
241
|
if (!Array.isArray(value)) {
|
|
229
242
|
return undefined;
|
package/dist/cli/shared.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/cli/shared.ts"],"names":[],"mappings":";;;;;;AAiCA,8BA8BC;AAED,8BAEC;AAED,4CAEC;AAED,0CAEC;AAED,sCAOC;AAED,0BAEC;AAED,wCAiBC;AAED,gDAiBC;AAqDD,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/cli/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,4 +4,4 @@ export interface AgentsTemplateInput {
|
|
|
4
4
|
workDir: string;
|
|
5
5
|
}
|
|
6
6
|
export declare function renderAgentsTemplate(input: AgentsTemplateInput): string;
|
|
7
|
-
export declare function
|
|
7
|
+
export declare function syncManagedSectionsInAgentsTemplate(source: string, goal: string): string | null;
|
|
@@ -4,12 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.renderAgentsTemplate = renderAgentsTemplate;
|
|
7
|
-
exports.
|
|
7
|
+
exports.syncManagedSectionsInAgentsTemplate = syncManagedSectionsInAgentsTemplate;
|
|
8
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
9
|
const GOAL_START_MARKER = '<!-- YW_GOAL_START -->';
|
|
10
10
|
const GOAL_END_MARKER = '<!-- YW_GOAL_END -->';
|
|
11
11
|
const GOAL_PREFIX = 'Your owner has given you a direction:\n\n';
|
|
12
12
|
const GOAL_SUFFIX = '\n\nTreat this as a long-term direction, not a short checklist to finish and forget.';
|
|
13
|
+
const SEARCH_GUIDANCE_START_MARKER = '<!-- YW_TARGETED_SEARCH_START -->';
|
|
14
|
+
const SEARCH_GUIDANCE_END_MARKER = '<!-- YW_TARGETED_SEARCH_END -->';
|
|
15
|
+
const SEARCH_GUIDANCE_ANCHOR = '\n\nSupported action verbs currently include:\n';
|
|
13
16
|
function renderAgentsTemplate(input) {
|
|
14
17
|
const inboxPath = node_path_1.default.join(input.workDir, 'inbox');
|
|
15
18
|
const runsPath = node_path_1.default.join(input.workDir, 'runs');
|
|
@@ -49,6 +52,8 @@ Start with these commands when you need context:
|
|
|
49
52
|
- \`yw rules verb <verb>\`
|
|
50
53
|
- \`yw action status\`
|
|
51
54
|
|
|
55
|
+
${renderManagedSearchGuidanceBlock()}
|
|
56
|
+
|
|
52
57
|
Supported action verbs currently include:
|
|
53
58
|
|
|
54
59
|
- \`move\`, \`gather\`, \`plant\`, \`harvest\`, \`consume\`, \`process\`
|
|
@@ -76,6 +81,13 @@ Action guidelines:
|
|
|
76
81
|
- Runs: ${runsPath}
|
|
77
82
|
`;
|
|
78
83
|
}
|
|
84
|
+
function syncManagedSectionsInAgentsTemplate(source, goal) {
|
|
85
|
+
const nextGoalSource = syncGoalInAgentsTemplate(source, goal);
|
|
86
|
+
if (nextGoalSource === null) {
|
|
87
|
+
return null;
|
|
88
|
+
}
|
|
89
|
+
return syncSearchGuidanceInAgentsTemplate(nextGoalSource);
|
|
90
|
+
}
|
|
79
91
|
function syncGoalInAgentsTemplate(source, goal) {
|
|
80
92
|
const managedGoalBlock = renderManagedGoalBlock(goal);
|
|
81
93
|
const managedBlockPattern = new RegExp(`${escapeRegExp(GOAL_START_MARKER)}[\\s\\S]*?${escapeRegExp(GOAL_END_MARKER)}`, 'u');
|
|
@@ -96,6 +108,36 @@ function syncGoalInAgentsTemplate(source, goal) {
|
|
|
96
108
|
function renderManagedGoalBlock(goal) {
|
|
97
109
|
return [GOAL_START_MARKER, ...goal.split(/\r?\n/u).map((line) => `> ${line}`), GOAL_END_MARKER].join('\n');
|
|
98
110
|
}
|
|
111
|
+
function renderManagedSearchGuidanceBlock() {
|
|
112
|
+
return [
|
|
113
|
+
SEARCH_GUIDANCE_START_MARKER,
|
|
114
|
+
'## Finding Specific Targets',
|
|
115
|
+
'',
|
|
116
|
+
'When your goal depends on a specific named resource, crop, structure, or recipe, do not spend many ticks wandering with only `yw observe`.',
|
|
117
|
+
'',
|
|
118
|
+
'Use this loop instead:',
|
|
119
|
+
'',
|
|
120
|
+
'- Run `yw catalog search --query <keyword>` first to identify the exact ids you need.',
|
|
121
|
+
'- If you are looking for a resource node, run `yw observe --resource <resource-type-id>` and use `resourceHints` to choose direction.',
|
|
122
|
+
'- If you are looking for a world object or direct archetype instance, run `yw observe --archetype <archetype-id>` and use `archetypeHints`.',
|
|
123
|
+
'- After moving, run the targeted observe command again instead of continuing blind exploration.',
|
|
124
|
+
'',
|
|
125
|
+
'When a goal mentions a concrete target such as wheat, wood, ore, furnace, workbench, warehouse, or berry, start with catalog search and targeted observe before committing to multi-tick travel.',
|
|
126
|
+
SEARCH_GUIDANCE_END_MARKER,
|
|
127
|
+
].join('\n');
|
|
128
|
+
}
|
|
129
|
+
function syncSearchGuidanceInAgentsTemplate(source) {
|
|
130
|
+
const managedGuidanceBlock = renderManagedSearchGuidanceBlock();
|
|
131
|
+
const managedBlockPattern = new RegExp(`${escapeRegExp(SEARCH_GUIDANCE_START_MARKER)}[\\s\\S]*?${escapeRegExp(SEARCH_GUIDANCE_END_MARKER)}`, 'u');
|
|
132
|
+
if (managedBlockPattern.test(source)) {
|
|
133
|
+
return source.replace(managedBlockPattern, managedGuidanceBlock);
|
|
134
|
+
}
|
|
135
|
+
const anchorIndex = source.indexOf(SEARCH_GUIDANCE_ANCHOR);
|
|
136
|
+
if (anchorIndex === -1) {
|
|
137
|
+
return source;
|
|
138
|
+
}
|
|
139
|
+
return `${source.slice(0, anchorIndex)}\n\n${managedGuidanceBlock}${source.slice(anchorIndex)}`;
|
|
140
|
+
}
|
|
99
141
|
function escapeRegExp(source) {
|
|
100
142
|
return source.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
|
|
101
143
|
}
|
|
@@ -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":"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"}
|
|
@@ -48,7 +48,7 @@ class WorkspaceManager {
|
|
|
48
48
|
return true;
|
|
49
49
|
}
|
|
50
50
|
const existing = await (0, promises_1.readFile)(instructionFilePath, 'utf8');
|
|
51
|
-
const next = (0, agents_template_1.
|
|
51
|
+
const next = (0, agents_template_1.syncManagedSectionsInAgentsTemplate)(existing, session.goal);
|
|
52
52
|
if (next === null || next === existing) {
|
|
53
53
|
return false;
|
|
54
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-manager.js","sourceRoot":"","sources":["../../src/runtime/workspace-manager.ts"],"names":[],"mappings":";;;AAAA,+CAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"workspace-manager.js","sourceRoot":"","sources":["../../src/runtime/workspace-manager.ts"],"names":[],"mappings":";;;AAAA,+CAA+D;AAE/D,kEAAyG;AACzG,4DAA8D;AAI9D,MAAa,gBAAgB;IACI;IAA7B,YAA6B,KAAmB;QAAnB,UAAK,GAAL,KAAK,CAAc;IAAG,CAAC;IAEpD,KAAK,CAAC,eAAe,CAAC,OAA6B;QAC/C,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QACnC,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAA,oBAAS,EACX,mBAAmB,EACnB,IAAA,sCAAoB,EAAC;gBACjB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;aAC3B,CAAC,EACF,MAAM,CACT,CAAC;YACF,OAAO;QACX,CAAC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAuB;QACpC,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAa,EAAE,QAAsB;QACjD,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAA,gCAAiB,EAAC,QAAQ,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAA6B;QAIxC,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QACnC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACzD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEvH,OAAO;YACH,aAAa;YACb,gBAAgB;SACnB,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAA6B;QACtD,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAA,oBAAS,EACX,mBAAmB,EACnB,IAAA,sCAAoB,EAAC;gBACjB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;aAC3B,CAAC,EACF,MAAM,CACT,CAAC;YACF,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,mBAAQ,EAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,IAAA,qDAAmC,EAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,IAAA,oBAAS,EAAC,mBAAmB,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,KAAa,EAAE,IAAY;QACvD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACtC,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,MAAM,YAAY,GAAiB;YAC/B,GAAG,QAAQ;YACX,IAAI;SACP,CAAC;QACF,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,EAAE,YAAY,EAAE,IAAA,gCAAiB,EAAC,YAAY,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAlFD,4CAkFC;AAED,KAAK,UAAU,UAAU,CAAC,QAAgB;IACtC,IAAI,CAAC;QACD,MAAM,IAAA,iBAAM,EAAC,QAAQ,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC"}
|