@your-world/cli 0.1.10 → 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.
|
@@ -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"}
|