@namzu/sdk 56.0.1 → 56.2.0
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/CHANGELOG.md +27 -0
- package/dist/compaction/context-breakdown.d.ts +1 -1
- package/dist/compaction/context-breakdown.d.ts.map +1 -1
- package/dist/compaction/context-breakdown.js +9 -2
- package/dist/compaction/context-breakdown.js.map +1 -1
- package/dist/compaction/verifier.d.ts.map +1 -1
- package/dist/compaction/verifier.js +3 -1
- package/dist/compaction/verifier.js.map +1 -1
- package/dist/public-runtime.d.ts +1 -1
- package/dist/public-runtime.d.ts.map +1 -1
- package/dist/public-runtime.js +1 -1
- package/dist/public-runtime.js.map +1 -1
- package/dist/runtime/query/executor.d.ts +17 -1
- package/dist/runtime/query/executor.d.ts.map +1 -1
- package/dist/runtime/query/executor.js +73 -5
- package/dist/runtime/query/executor.js.map +1 -1
- package/dist/runtime/query/file-evidence-context.d.ts +21 -4
- package/dist/runtime/query/file-evidence-context.d.ts.map +1 -1
- package/dist/runtime/query/file-evidence-context.js +70 -8
- package/dist/runtime/query/file-evidence-context.js.map +1 -1
- package/dist/runtime/query/index.d.ts.map +1 -1
- package/dist/runtime/query/index.js +2 -11
- package/dist/runtime/query/index.js.map +1 -1
- package/dist/runtime/query/iteration/index.d.ts +1 -2
- package/dist/runtime/query/iteration/index.d.ts.map +1 -1
- package/dist/runtime/query/iteration/index.js +30 -19
- package/dist/runtime/query/iteration/index.js.map +1 -1
- package/dist/runtime/query/iteration/recorded-context.d.ts +18 -0
- package/dist/runtime/query/iteration/recorded-context.d.ts.map +1 -0
- package/dist/runtime/query/iteration/recorded-context.js +37 -0
- package/dist/runtime/query/iteration/recorded-context.js.map +1 -0
- package/dist/runtime/query/iteration/step-context.d.ts +15 -51
- package/dist/runtime/query/iteration/step-context.d.ts.map +1 -1
- package/dist/runtime/query/iteration/step-context.js +24 -134
- package/dist/runtime/query/iteration/step-context.js.map +1 -1
- package/dist/runtime/query/iteration/step-shaping.d.ts +20 -8
- package/dist/runtime/query/iteration/step-shaping.d.ts.map +1 -1
- package/dist/runtime/query/iteration/step-shaping.js +52 -26
- package/dist/runtime/query/iteration/step-shaping.js.map +1 -1
- package/dist/scheduler/completion-inbox.d.ts +27 -0
- package/dist/scheduler/completion-inbox.d.ts.map +1 -1
- package/dist/scheduler/completion-inbox.js +88 -21
- package/dist/scheduler/completion-inbox.js.map +1 -1
- package/dist/store/session-index/fts.d.ts.map +1 -1
- package/dist/store/session-index/fts.js +6 -0
- package/dist/store/session-index/fts.js.map +1 -1
- package/dist/test-support/file-evidence-held.d.ts +11 -0
- package/dist/test-support/file-evidence-held.d.ts.map +1 -0
- package/dist/test-support/file-evidence-held.js +28 -0
- package/dist/test-support/file-evidence-held.js.map +1 -0
- package/dist/test-support/request-only.d.ts +10 -0
- package/dist/test-support/request-only.d.ts.map +1 -0
- package/dist/test-support/request-only.js +15 -0
- package/dist/test-support/request-only.js.map +1 -0
- package/dist/tools/builtins/content-fingerprint.d.ts +12 -0
- package/dist/tools/builtins/content-fingerprint.d.ts.map +1 -1
- package/dist/tools/builtins/content-fingerprint.js +14 -0
- package/dist/tools/builtins/content-fingerprint.js.map +1 -1
- package/dist/tools/builtins/edit.d.ts.map +1 -1
- package/dist/tools/builtins/edit.js +19 -16
- package/dist/tools/builtins/edit.js.map +1 -1
- package/dist/tools/builtins/stale-before-review.d.ts +18 -0
- package/dist/tools/builtins/stale-before-review.d.ts.map +1 -0
- package/dist/tools/builtins/stale-before-review.js +42 -0
- package/dist/tools/builtins/stale-before-review.js.map +1 -0
- package/dist/tools/builtins/write-file.d.ts.map +1 -1
- package/dist/tools/builtins/write-file.js +4 -0
- package/dist/tools/builtins/write-file.js.map +1 -1
- package/dist/tools/defineTool.d.ts +2 -0
- package/dist/tools/defineTool.d.ts.map +1 -1
- package/dist/tools/defineTool.js +1 -0
- package/dist/tools/defineTool.js.map +1 -1
- package/dist/tools/untrusted-envelope.d.ts +7 -0
- package/dist/tools/untrusted-envelope.d.ts.map +1 -1
- package/dist/tools/untrusted-envelope.js +3 -1
- package/dist/tools/untrusted-envelope.js.map +1 -1
- package/dist/turn/evidence-recall.d.ts +19 -8
- package/dist/turn/evidence-recall.d.ts.map +1 -1
- package/dist/turn/evidence-recall.js +134 -53
- package/dist/turn/evidence-recall.js.map +1 -1
- package/dist/turn/memory-recall.d.ts +18 -0
- package/dist/turn/memory-recall.d.ts.map +1 -1
- package/dist/turn/memory-recall.js +43 -4
- package/dist/turn/memory-recall.js.map +1 -1
- package/dist/types/message/index.d.ts +46 -1
- package/dist/types/message/index.d.ts.map +1 -1
- package/dist/types/message/index.js +78 -1
- package/dist/types/message/index.js.map +1 -1
- package/dist/types/session/prepare-step.d.ts +24 -0
- package/dist/types/session/prepare-step.d.ts.map +1 -1
- package/dist/types/tool/index.d.ts +16 -0
- package/dist/types/tool/index.d.ts.map +1 -1
- package/dist/types/tool/index.js.map +1 -1
- package/package.json +1 -1
- package/src/compaction/context-breakdown.ts +11 -3
- package/src/compaction/verifier.ts +3 -1
- package/src/public-runtime.ts +7 -0
- package/src/runtime/query/executor.ts +84 -5
- package/src/runtime/query/file-evidence-context.ts +79 -11
- package/src/runtime/query/index.ts +2 -10
- package/src/runtime/query/iteration/index.ts +32 -26
- package/src/runtime/query/iteration/recorded-context.ts +48 -0
- package/src/runtime/query/iteration/step-context.ts +27 -155
- package/src/runtime/query/iteration/step-shaping.ts +64 -40
- package/src/scheduler/completion-inbox.ts +87 -20
- package/src/store/session-index/fts.ts +5 -0
- package/src/test-support/file-evidence-held.ts +27 -0
- package/src/test-support/request-only.ts +19 -0
- package/src/tools/builtins/content-fingerprint.ts +20 -0
- package/src/tools/builtins/edit.ts +18 -15
- package/src/tools/builtins/stale-before-review.ts +45 -0
- package/src/tools/builtins/write-file.ts +5 -0
- package/src/tools/defineTool.ts +3 -0
- package/src/tools/untrusted-envelope.ts +10 -1
- package/src/turn/evidence-recall.ts +189 -58
- package/src/turn/memory-recall.ts +59 -5
- package/src/types/message/index.ts +108 -1
- package/src/types/session/prepare-step.ts +26 -0
- package/src/types/tool/index.ts +18 -0
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { NAMZU } from '../../../constants/telemetry/index.js'
|
|
2
|
+
import type { TurnRecorder } from '../../../manager/session/turn-recorder.js'
|
|
3
|
+
import {
|
|
4
|
+
type Message,
|
|
5
|
+
createTurnContextEntry,
|
|
6
|
+
isTurnContextKey,
|
|
7
|
+
turnContextEntries,
|
|
8
|
+
} from '../../../types/message/index.js'
|
|
9
|
+
import type { RecordedContextItem } from '../../../types/session/index.js'
|
|
10
|
+
import type { Logger } from '../../../utils/logger.js'
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Append what a step asked to have recorded, after whatever the history
|
|
14
|
+
* ends with.
|
|
15
|
+
*
|
|
16
|
+
* Only at the end: an entry slipped in ahead of the operator's message would
|
|
17
|
+
* put the live array out of log order, and the recorder would then write a
|
|
18
|
+
* whole compaction record to re-base it on every turn. An item adds nothing
|
|
19
|
+
* when its text is empty or equals the last entry under its key, so a step
|
|
20
|
+
* that offers the same text on every call records it once. Returns the
|
|
21
|
+
* entries it added, so a request built before they were added can carry them
|
|
22
|
+
* at the place they will hold.
|
|
23
|
+
*/
|
|
24
|
+
export function appendRecordedContext(
|
|
25
|
+
recorder: Pick<TurnRecorder, 'messages' | 'pushMessage' | 'turnId'>,
|
|
26
|
+
items: readonly RecordedContextItem[] | undefined,
|
|
27
|
+
log: Pick<Logger, 'warn'>,
|
|
28
|
+
at: Date = new Date(),
|
|
29
|
+
): Message[] {
|
|
30
|
+
const appended: Message[] = []
|
|
31
|
+
for (const item of items ?? []) {
|
|
32
|
+
const text = item.text.trim()
|
|
33
|
+
if (text.length === 0) continue
|
|
34
|
+
if (!isTurnContextKey(item.key)) {
|
|
35
|
+
log.warn('A step recorded context under a key that is not a name; it was skipped', {
|
|
36
|
+
[NAMZU.TURN_ID]: recorder.turnId,
|
|
37
|
+
'namzu.runtime.key': String(item.key).slice(0, 80),
|
|
38
|
+
})
|
|
39
|
+
continue
|
|
40
|
+
}
|
|
41
|
+
const earlier = turnContextEntries(recorder.messages, item.key)
|
|
42
|
+
if (earlier.at(-1) === text) continue
|
|
43
|
+
const entry = createTurnContextEntry(item.key, text, at, { later: earlier.length > 0 })
|
|
44
|
+
recorder.pushMessage(entry)
|
|
45
|
+
appended.push(entry)
|
|
46
|
+
}
|
|
47
|
+
return appended
|
|
48
|
+
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { createRuntimeContextMessage } from '../../../types/message/index.js'
|
|
2
2
|
import type { Message } from '../../../types/message/index.js'
|
|
3
|
-
import { isOperatorUserMessage } from '../steering.js'
|
|
4
3
|
|
|
5
4
|
/**
|
|
6
5
|
* Request-only context, as the model reads it: a runtime-context user
|
|
@@ -18,167 +17,40 @@ export function stepContextMessage(content: string) {
|
|
|
18
17
|
)
|
|
19
18
|
}
|
|
20
19
|
|
|
21
|
-
/**
|
|
22
|
-
* Put `blocks` in front of the operator's new message when that message is
|
|
23
|
-
* what the model is about to answer, so the request is the last thing it
|
|
24
|
-
* reads and the longest data comes before it. Only the reminders and other
|
|
25
|
-
* request-only context may follow that message: once the turn has an
|
|
26
|
-
* assistant or tool message after it, the blocks stay at the end of the
|
|
27
|
-
* history, where a caching driver ends its breakpoint before them, so the
|
|
28
|
-
* tool loop of a long turn is not re-read at full price on every step.
|
|
29
|
-
*
|
|
30
|
-
* Reminders and notices that follow the operator's message stay where they
|
|
31
|
-
* are: they are short, and the edge after the request is where they are read.
|
|
32
|
-
*/
|
|
33
|
-
export function placeBeforeLatestOperatorMessage(history: Message[], blocks: readonly Message[]) {
|
|
34
|
-
if (blocks.length === 0) return
|
|
35
|
-
let at = history.length
|
|
36
|
-
for (let i = history.length - 1; i >= 0; i--) {
|
|
37
|
-
const message = history[i] as Message
|
|
38
|
-
if (isOperatorUserMessage(message)) {
|
|
39
|
-
at = i
|
|
40
|
-
break
|
|
41
|
-
}
|
|
42
|
-
// A reply or a tool result after the message: the model has moved on.
|
|
43
|
-
if (message.role === 'assistant' || message.role === 'tool') break
|
|
44
|
-
}
|
|
45
|
-
history.splice(at, 0, ...blocks)
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
interface PlacedBlock {
|
|
49
|
-
readonly text: string
|
|
50
|
-
/** The operator message this block precedes, or the history message it follows. */
|
|
51
|
-
at: { readonly before: Message } | { readonly after: Message | undefined }
|
|
52
|
-
}
|
|
53
|
-
|
|
54
20
|
function textOf(message: Message): string {
|
|
55
21
|
return typeof message.content === 'string' ? message.content : JSON.stringify(message.content)
|
|
56
22
|
}
|
|
57
23
|
|
|
58
|
-
/** The operator message the model is about to answer, when there is one. */
|
|
59
|
-
function pendingOperatorMessage(history: readonly Message[]): Message | undefined {
|
|
60
|
-
for (let i = history.length - 1; i >= 0; i--) {
|
|
61
|
-
const message = history[i] as Message
|
|
62
|
-
if (isOperatorUserMessage(message)) return message
|
|
63
|
-
if (message.role === 'assistant' || message.role === 'tool') return undefined
|
|
64
|
-
}
|
|
65
|
-
return undefined
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
/** A block whose own text says that a later one replaces it, under the name of what it reports. */
|
|
69
|
-
export interface ReplaceableBlock {
|
|
70
|
-
readonly key: string
|
|
71
|
-
readonly message: Message
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
/** How many superseded versions of a replaceable block still go with the latest. */
|
|
75
|
-
export const EARLIER_VERSIONS_KEPT = 2
|
|
76
|
-
|
|
77
|
-
interface VersionedBlock extends PlacedBlock {
|
|
78
|
-
readonly message: Message
|
|
79
|
-
}
|
|
80
|
-
|
|
81
24
|
/**
|
|
82
|
-
*
|
|
83
|
-
*
|
|
84
|
-
* What a block says is the step's own business: a block it offers again with
|
|
85
|
-
* the same text is the same block, and it keeps the place it first had; a
|
|
86
|
-
* block it no longer offers is withdrawn, so corrected data never lingers.
|
|
87
|
-
* A block seen for the first time goes before the operator's message when that
|
|
88
|
-
* message is what the model is answering, and otherwise after the history of
|
|
89
|
-
* that moment. So the requests of a turn share their opening up to the first
|
|
90
|
-
* block that changed, and a caching driver keeps reading the same prefix
|
|
91
|
-
* instead of re-reading the turn from the operator's message on.
|
|
25
|
+
* Put a request's own data into it: after everything the history holds, in
|
|
26
|
+
* the order offered, each distinct text once.
|
|
92
27
|
*
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
*
|
|
96
|
-
*
|
|
97
|
-
*
|
|
98
|
-
*
|
|
99
|
-
*
|
|
100
|
-
*
|
|
28
|
+
* Request-only data is what the model needs for this request alone (a note
|
|
29
|
+
* that something is unavailable, the work still running). It is re-placed on
|
|
30
|
+
* every call and always last, so the history before it never changes shape
|
|
31
|
+
* from one call to the next and a caching driver, which ends its breakpoint
|
|
32
|
+
* before the first such block, covers the whole history on every call. What
|
|
33
|
+
* the model should keep reading in later requests is recorded as turn context
|
|
34
|
+
* instead (`PrepareStepResult.recordedContext`), and the loop records what it
|
|
35
|
+
* learns about files and finished work the same way.
|
|
101
36
|
*
|
|
102
|
-
*
|
|
103
|
-
*
|
|
37
|
+
* `request` is the projected history. `recorded` are entries the loop has just
|
|
38
|
+
* recorded: they join the history at the end of this call, so they go ahead
|
|
39
|
+
* of the first request-only block already in `request` (`tail` of them, at the
|
|
40
|
+
* end), which is where the next request will find them.
|
|
104
41
|
*/
|
|
105
|
-
export
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
end: Message | undefined,
|
|
119
|
-
blocks: readonly Message[],
|
|
120
|
-
replaceable: readonly ReplaceableBlock[] = [],
|
|
121
|
-
retractions: Readonly<Record<string, Message>> = {},
|
|
122
|
-
): void {
|
|
123
|
-
const index = (message: Message | undefined) =>
|
|
124
|
-
message ? history.lastIndexOf(message) : history.length - 1
|
|
125
|
-
const operator = pendingOperatorMessage(history)
|
|
126
|
-
const positionOf = (slot: PlacedBlock) =>
|
|
127
|
-
'before' in slot.at ? index(slot.at.before) : index(slot.at.after) + 1
|
|
128
|
-
const anchorOf = (slot: PlacedBlock) => ('before' in slot.at ? slot.at.before : slot.at.after)
|
|
129
|
-
const next = new Map<string, PlacedBlock>()
|
|
130
|
-
const inserts: { at: number; message: Message }[] = []
|
|
131
|
-
for (const message of blocks) {
|
|
132
|
-
const text = textOf(message)
|
|
133
|
-
if (next.has(text)) continue
|
|
134
|
-
let slot: PlacedBlock | undefined = this.placed.get(text)
|
|
135
|
-
if (slot) {
|
|
136
|
-
const anchor = anchorOf(slot)
|
|
137
|
-
if (anchor && index(anchor) < 0) slot = { text, at: { after: end } }
|
|
138
|
-
} else {
|
|
139
|
-
slot = { text, at: operator ? { before: operator } : { after: end } }
|
|
140
|
-
}
|
|
141
|
-
next.set(text, slot)
|
|
142
|
-
inserts.push({ at: positionOf(slot), message })
|
|
143
|
-
}
|
|
144
|
-
this.placed = next
|
|
145
|
-
|
|
146
|
-
const offered = new Map(replaceable.map((block) => [block.key, block.message]))
|
|
147
|
-
for (const key of new Set([...this.versions.keys(), ...offered.keys()])) {
|
|
148
|
-
const held = this.versions.get(key) ?? []
|
|
149
|
-
const wanted = offered.get(key) ?? retractions[key]
|
|
150
|
-
const last = held.at(-1)
|
|
151
|
-
if (wanted !== undefined && (last === undefined || last.text !== textOf(wanted)))
|
|
152
|
-
held.push({
|
|
153
|
-
text: textOf(wanted),
|
|
154
|
-
message: wanted,
|
|
155
|
-
// The first version goes where the other blocks go; a later one
|
|
156
|
-
// follows the history, after the one it replaces.
|
|
157
|
-
at: last === undefined && operator ? { before: operator } : { after: end },
|
|
158
|
-
})
|
|
159
|
-
// An earlier version whose place a compaction rewrote is given up: the
|
|
160
|
-
// request is rewritten at that point anyway, and stacking stale copies
|
|
161
|
-
// at the end would only add bulk. The latest version is never given up.
|
|
162
|
-
const kept = held.filter((version, i) => {
|
|
163
|
-
if (i === held.length - 1) return true
|
|
164
|
-
const anchor = anchorOf(version)
|
|
165
|
-
return !anchor || index(anchor) >= 0
|
|
166
|
-
})
|
|
167
|
-
// Only the latest and a few earlier versions are carried, so a long turn
|
|
168
|
-
// does not grow by a full copy per change.
|
|
169
|
-
kept.splice(0, Math.max(0, kept.length - (EARLIER_VERSIONS_KEPT + 1)))
|
|
170
|
-
this.versions.set(key, kept)
|
|
171
|
-
for (const version of kept) {
|
|
172
|
-
const anchor = anchorOf(version)
|
|
173
|
-
if (anchor && index(anchor) < 0) version.at = { after: end }
|
|
174
|
-
inserts.push({ at: positionOf(version), message: version.message })
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
// Back to front, so an earlier position is not shifted by a later one;
|
|
179
|
-
// blocks at one position keep the order they were offered in.
|
|
180
|
-
const order = inserts.map((entry, position) => ({ ...entry, position }))
|
|
181
|
-
order.sort((a, b) => b.at - a.at || b.position - a.position)
|
|
182
|
-
for (const entry of order) request.splice(entry.at, 0, entry.message)
|
|
42
|
+
export function placeRequestContext(
|
|
43
|
+
request: Message[],
|
|
44
|
+
recorded: readonly Message[],
|
|
45
|
+
tail: number,
|
|
46
|
+
blocks: readonly Message[],
|
|
47
|
+
): void {
|
|
48
|
+
if (recorded.length > 0) request.splice(request.length - tail, 0, ...recorded)
|
|
49
|
+
const seen = new Set<string>()
|
|
50
|
+
for (const message of blocks) {
|
|
51
|
+
const text = textOf(message)
|
|
52
|
+
if (seen.has(text)) continue
|
|
53
|
+
seen.add(text)
|
|
54
|
+
request.push(message)
|
|
183
55
|
}
|
|
184
56
|
}
|
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
import { resolveContextWindow } from '../../../compaction/context-window.js'
|
|
2
|
-
import { estimateMessageTokens } from '../../../compaction/token-estimate.js'
|
|
2
|
+
import { estimateMessageTokens, estimateTextTokens } from '../../../compaction/token-estimate.js'
|
|
3
3
|
import { NAMZU } from '../../../constants/telemetry/index.js'
|
|
4
4
|
import { renderSkillsSection } from '../../../persona/assembler.js'
|
|
5
|
+
import { recordedOwnedTaskIds } from '../../../scheduler/completion-inbox.js'
|
|
5
6
|
import { PreparationContextError } from '../../../turn/preparation-context-error.js'
|
|
6
7
|
import {
|
|
7
8
|
type Message,
|
|
8
9
|
type UserMessage,
|
|
9
10
|
createSystemMessage,
|
|
11
|
+
turnContextEntries,
|
|
10
12
|
} from '../../../types/message/index.js'
|
|
11
13
|
import type { ToolChoice } from '../../../types/provider/chat.js'
|
|
12
14
|
import type {
|
|
13
15
|
PrepareStepContext,
|
|
14
16
|
PrepareStepResult,
|
|
17
|
+
RecordedContextItem,
|
|
15
18
|
StepResult,
|
|
16
19
|
StepVeto,
|
|
17
20
|
} from '../../../types/session/index.js'
|
|
18
21
|
import type { Skill } from '../../../types/skills/index.js'
|
|
19
22
|
import { toErrorMessage } from '../../../utils/error.js'
|
|
20
23
|
import { createCallbackInference } from '../callback-inference.js'
|
|
24
|
+
import { recordFileEvidence } from '../file-evidence-context.js'
|
|
21
25
|
import { measureContext } from './phases/compaction.js'
|
|
22
26
|
import type { IterationContext } from './phases/index.js'
|
|
23
|
-
import {
|
|
24
|
-
type ReplaceableBlock,
|
|
25
|
-
placeBeforeLatestOperatorMessage,
|
|
26
|
-
stepContextMessage,
|
|
27
|
-
} from './step-context.js'
|
|
27
|
+
import { stepContextMessage } from './step-context.js'
|
|
28
28
|
|
|
29
29
|
/**
|
|
30
30
|
* How the next request is shaped: admission, preparation, and the context
|
|
@@ -48,57 +48,68 @@ export interface StepShaping {
|
|
|
48
48
|
|
|
49
49
|
export { stepContextMessage }
|
|
50
50
|
|
|
51
|
-
/**
|
|
52
|
-
export function appendWorkContext(
|
|
53
|
-
shaping: StepShaping,
|
|
54
|
-
messages: Message[],
|
|
55
|
-
stepNumber: number,
|
|
56
|
-
prepared: PrepareStepResult,
|
|
57
|
-
): void {
|
|
58
|
-
// Per-turn data goes in front of the operator's new message while that is
|
|
59
|
-
// what the model is answering, like the other blocks of request-only data.
|
|
60
|
-
placeBeforeLatestOperatorMessage(
|
|
61
|
-
messages,
|
|
62
|
-
workContextBlocks(shaping, messages, stepNumber, prepared).map((block) => block.message),
|
|
63
|
-
)
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
/** What the two work-context blocks report; each tells the model a later one replaces it. */
|
|
51
|
+
/** The names the two kinds of recorded work context are filed under. */
|
|
67
52
|
export const OWNED_WORK_KEY = 'owned-work'
|
|
68
53
|
export const FILE_EVIDENCE_KEY = 'file-evidence'
|
|
69
54
|
|
|
55
|
+
/** What the work context says for one request. */
|
|
56
|
+
export interface WorkContext {
|
|
57
|
+
/** Facts that do not change once true, to be kept in the conversation. */
|
|
58
|
+
readonly recorded: RecordedContextItem[]
|
|
59
|
+
/** Facts about now, shown with this request only. */
|
|
60
|
+
readonly requestOnly: Message[]
|
|
61
|
+
}
|
|
62
|
+
|
|
70
63
|
/**
|
|
71
|
-
* The work
|
|
72
|
-
*
|
|
64
|
+
* The work context for a request whose projected messages are `messages`.
|
|
65
|
+
*
|
|
66
|
+
* Two kinds of fact, each where it belongs. What holds until something
|
|
67
|
+
* changes it, or never changes, is recorded: the file entries that are new or
|
|
68
|
+
* changed since the last record (with the paths whose entry no longer holds),
|
|
69
|
+
* and each owned task once it has finished. What is true only now, the tasks
|
|
70
|
+
* still running, goes with this request alone. Each text is admitted whole or
|
|
71
|
+
* not at all, within the room the request has left.
|
|
73
72
|
*/
|
|
74
|
-
export function
|
|
73
|
+
export function workContext(
|
|
75
74
|
shaping: StepShaping,
|
|
76
75
|
messages: readonly Message[],
|
|
77
76
|
stepNumber: number,
|
|
78
77
|
prepared: PrepareStepResult,
|
|
79
|
-
):
|
|
78
|
+
): WorkContext {
|
|
80
79
|
const { ctx } = shaping
|
|
80
|
+
const held = (key: string) => turnContextEntries(ctx.recorder.messages, key)
|
|
81
|
+
const inbox = ctx.completionInbox
|
|
81
82
|
|
|
82
|
-
const contributions =
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
83
|
+
const contributions: { content: string | undefined; key?: string }[] = [
|
|
84
|
+
{ content: inbox?.describeRunningWork() },
|
|
85
|
+
{
|
|
86
|
+
content: inbox?.describeSettledWork(recordedOwnedTaskIds(held(OWNED_WORK_KEY))),
|
|
87
|
+
key: OWNED_WORK_KEY,
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
content: recordFileEvidence(
|
|
91
|
+
ctx.toolExecutor.fileEvidenceEntries(messages),
|
|
92
|
+
held(FILE_EVIDENCE_KEY),
|
|
93
|
+
),
|
|
94
|
+
key: FILE_EVIDENCE_KEY,
|
|
95
|
+
},
|
|
96
|
+
]
|
|
97
|
+
const present = contributions.filter((entry) => Boolean(entry.content))
|
|
98
|
+
const work: WorkContext = { recorded: [], requestOnly: [] }
|
|
99
|
+
if (present.length === 0) return work
|
|
90
100
|
let room = stepContext(shaping, stepNumber, prepared).contextBudget?.remainingTokens ?? 0
|
|
91
101
|
// Leave room for the actual task; admit whole contributions, never dangling partial references.
|
|
92
|
-
if (room < 1_500) return
|
|
93
|
-
for (const
|
|
102
|
+
if (room < 1_500) return work
|
|
103
|
+
for (const { content, key } of present) {
|
|
94
104
|
if (!content || content.length > 8_000) continue
|
|
95
105
|
const message = stepContextMessage(content)
|
|
96
106
|
const tokens = estimateMessageTokens(message)
|
|
97
107
|
if (tokens > Math.min(2_000, room - 1_000)) continue
|
|
98
|
-
|
|
108
|
+
if (key) work.recorded.push({ key, text: content })
|
|
109
|
+
else work.requestOnly.push(message)
|
|
99
110
|
room -= tokens
|
|
100
111
|
}
|
|
101
|
-
return
|
|
112
|
+
return work
|
|
102
113
|
}
|
|
103
114
|
|
|
104
115
|
export function stepContext(
|
|
@@ -122,7 +133,8 @@ export function stepContext(
|
|
|
122
133
|
const preamble = [prepared.system, skills].filter(Boolean).join('\n\n')
|
|
123
134
|
const preparedTokens =
|
|
124
135
|
(preamble ? estimateMessageTokens(createSystemMessage(preamble)) : 0) +
|
|
125
|
-
(prepared.context ? estimateMessageTokens(stepContextMessage(prepared.context)) : 0)
|
|
136
|
+
(prepared.context ? estimateMessageTokens(stepContextMessage(prepared.context)) : 0) +
|
|
137
|
+
(prepared.recordedContext ?? []).reduce((sum, item) => sum + estimateTextTokens(item.text), 0)
|
|
126
138
|
const responseReserve = Math.min(
|
|
127
139
|
prepared.maxResponseTokens ?? ctx.turnConfig.maxResponseTokens ?? Math.floor(window.tokens / 4),
|
|
128
140
|
Math.floor(window.tokens / 4),
|
|
@@ -180,6 +192,7 @@ export async function prepareStep(
|
|
|
180
192
|
model?: string
|
|
181
193
|
system?: string
|
|
182
194
|
context?: string
|
|
195
|
+
recordedContext?: readonly RecordedContextItem[]
|
|
183
196
|
skills?: readonly Skill[]
|
|
184
197
|
temperature?: number
|
|
185
198
|
maxResponseTokens?: number
|
|
@@ -206,7 +219,16 @@ export async function prepareStep(
|
|
|
206
219
|
...stepContext(shaping, stepNumber, result),
|
|
207
220
|
generateText: inference.generateText,
|
|
208
221
|
})
|
|
209
|
-
if (decided)
|
|
222
|
+
if (decided) {
|
|
223
|
+
// Recorded context adds up across stages: each stage files its own
|
|
224
|
+
// keys, and one stage must not erase what an earlier one recorded.
|
|
225
|
+
const recorded = [...(result.recordedContext ?? []), ...(decided.recordedContext ?? [])]
|
|
226
|
+
result = {
|
|
227
|
+
...result,
|
|
228
|
+
...decided,
|
|
229
|
+
...(recorded.length > 0 ? { recordedContext: recorded } : {}),
|
|
230
|
+
}
|
|
231
|
+
}
|
|
210
232
|
await selectContextModel(shaping, result.model ?? ctx.turnConfig.model)
|
|
211
233
|
} catch (err) {
|
|
212
234
|
// Skipped, and the rest still run: one broken concern must
|
|
@@ -242,6 +264,7 @@ export async function prepareStep(
|
|
|
242
264
|
model?: string
|
|
243
265
|
system?: string
|
|
244
266
|
context?: string
|
|
267
|
+
recordedContext?: readonly RecordedContextItem[]
|
|
245
268
|
skills?: readonly Skill[]
|
|
246
269
|
temperature?: number
|
|
247
270
|
maxResponseTokens?: number
|
|
@@ -279,6 +302,7 @@ export async function prepareStep(
|
|
|
279
302
|
if (result.model !== undefined) prepared.model = result.model
|
|
280
303
|
if (result.system !== undefined) prepared.system = result.system
|
|
281
304
|
if (result.context !== undefined) prepared.context = result.context
|
|
305
|
+
if (result.recordedContext !== undefined) prepared.recordedContext = result.recordedContext
|
|
282
306
|
if (result.skills !== undefined) prepared.skills = result.skills
|
|
283
307
|
if (result.temperature !== undefined) prepared.temperature = result.temperature
|
|
284
308
|
if (result.maxResponseTokens !== undefined) {
|
|
@@ -31,10 +31,11 @@ const UNOWNED_BUFFER_LIMIT = 32
|
|
|
31
31
|
* once.
|
|
32
32
|
*
|
|
33
33
|
* Unrelated to {@link UNOWNED_BUFFER_LIMIT} — that one bounds a memory leak;
|
|
34
|
-
* this one bounds a request payload.
|
|
35
|
-
* into the request through
|
|
36
|
-
*
|
|
37
|
-
* state fits that with room to spare, including the
|
|
34
|
+
* this one bounds a request payload. What the inbox describes is admitted
|
|
35
|
+
* into the request through the work-context gate of 8,000 characters and
|
|
36
|
+
* about 2,000 tokens (`runtime/query/iteration/step-shaping.ts`), and 16
|
|
37
|
+
* tasks' worth of scheduler state fits that with room to spare, including the
|
|
38
|
+
* overflow note below.
|
|
38
39
|
*
|
|
39
40
|
* Running tasks fill these slots first — see {@link CompletionInbox.runningOwned}
|
|
40
41
|
* — so a task still going is never bumped out by launch count alone the way a
|
|
@@ -43,6 +44,31 @@ const UNOWNED_BUFFER_LIMIT = 32
|
|
|
43
44
|
*/
|
|
44
45
|
const OWNED_WORK_DISPLAY_LIMIT = 16
|
|
45
46
|
|
|
47
|
+
/** What the model is told about owned work, wherever it is shown. */
|
|
48
|
+
const OWNED_WORK_GUIDANCE =
|
|
49
|
+
'Each task gives its id (taskId), its state, how its turn ended (turnStatus), why it stopped (stopReason), and whether its result has reached this conversation (resultDelivery: delivered-to-history, or not-delivered). Result delivery is not proof that you answered the original request. Answer the latest operator message and complete the requested synthesis of available results unless the operator cancelled or changed that request. Reuse delivered results when sufficient; do not relaunch completed work. If a delivered result is no longer visible, retrieve it by task ID. A terminal state with a non-end_turn stop reason is not successful task completion. Do not repeat a synthesis already given.'
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* The ids of the tasks that earlier recorded entries name, read from the
|
|
53
|
+
* entries' text, so what is recorded is known from the conversation alone.
|
|
54
|
+
*/
|
|
55
|
+
export function recordedOwnedTaskIds(entries: readonly string[]): Set<string> {
|
|
56
|
+
const ids = new Set<string>()
|
|
57
|
+
for (const entry of entries) {
|
|
58
|
+
for (const line of entry.split('\n')) {
|
|
59
|
+
if (!line.startsWith('{')) continue
|
|
60
|
+
try {
|
|
61
|
+
const parsed = JSON.parse(line) as { tasks?: { taskId?: unknown }[] }
|
|
62
|
+
for (const task of Array.isArray(parsed.tasks) ? parsed.tasks : [])
|
|
63
|
+
if (typeof task?.taskId === 'string') ids.add(task.taskId)
|
|
64
|
+
} catch {
|
|
65
|
+
// a line of the entry that is not the task list
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return ids
|
|
70
|
+
}
|
|
71
|
+
|
|
46
72
|
export interface CompletionInboxOptions {
|
|
47
73
|
/** See {@link CompletionInbox.holdsTurnOpen}. Default `true`. */
|
|
48
74
|
readonly holdsTurnOpen?: boolean
|
|
@@ -451,6 +477,10 @@ export class CompletionInbox {
|
|
|
451
477
|
* model once — but a RUNNING task that does not fit is: the preamble
|
|
452
478
|
* says exactly how many, so the model never mistakes the cap for the
|
|
453
479
|
* task having ended.
|
|
480
|
+
*
|
|
481
|
+
* @deprecated The query loop reads {@link describeRunningWork} for the
|
|
482
|
+
* request and {@link describeSettledWork} for what it records. This single
|
|
483
|
+
* snapshot is kept for hosts that read it themselves.
|
|
454
484
|
*/
|
|
455
485
|
describeOwnedWork(): string | undefined {
|
|
456
486
|
if (this.ours.size === 0) return
|
|
@@ -460,26 +490,63 @@ export class CompletionInbox {
|
|
|
460
490
|
const settled = [...this.settledOwned].reverse()
|
|
461
491
|
const shownSettled = settled.slice(0, OWNED_WORK_DISPLAY_LIMIT - shownRunning.length)
|
|
462
492
|
const ids = [...shownRunning, ...shownSettled]
|
|
463
|
-
const tasks = ids.map((taskId) =>
|
|
464
|
-
let handle = this.unheard.get(taskId)
|
|
465
|
-
try {
|
|
466
|
-
handle = this.gateway?.getTask(taskId) ?? handle
|
|
467
|
-
} catch {
|
|
468
|
-
// A broken observation must not block execution or invent a task state.
|
|
469
|
-
}
|
|
470
|
-
return {
|
|
471
|
-
taskId,
|
|
472
|
-
state: handle?.state ?? 'unknown',
|
|
473
|
-
...(handle?.result?.status ? { turnStatus: handle.result.status } : {}),
|
|
474
|
-
...(handle?.result?.stopReason ? { stopReason: handle.result.stopReason } : {}),
|
|
475
|
-
resultDelivery: this.claimed.has(taskId) ? 'delivered-to-history' : 'not-delivered',
|
|
476
|
-
}
|
|
477
|
-
})
|
|
493
|
+
const tasks = ids.map((taskId) => this.observe(taskId))
|
|
478
494
|
const overflow =
|
|
479
495
|
stillRunningNotShown > 0
|
|
480
496
|
? ` ${shownRunning.length} running tasks are shown below, and ${stillRunningNotShown} more still running.`
|
|
481
497
|
: ''
|
|
482
|
-
return `Owned delegated work (current scheduler observations
|
|
498
|
+
return `Owned delegated work (current scheduler observations).${overflow} ${OWNED_WORK_GUIDANCE}\n${JSON.stringify({ tasks, omitted: this.ours.size - ids.length })}`
|
|
499
|
+
}
|
|
500
|
+
|
|
501
|
+
/**
|
|
502
|
+
* The tasks this turn launched that are still going, for the request that
|
|
503
|
+
* is about to be sent and for no other: running state changes, so it is
|
|
504
|
+
* never recorded. Most recently launched first; a task that does not fit
|
|
505
|
+
* is counted, so the model never mistakes the cap for the task having
|
|
506
|
+
* ended. Undefined when nothing is running.
|
|
507
|
+
*/
|
|
508
|
+
describeRunningWork(): string | undefined {
|
|
509
|
+
if (this.runningOwned.size === 0) return
|
|
510
|
+
const running = [...this.runningOwned].reverse()
|
|
511
|
+
const shown = running.slice(0, OWNED_WORK_DISPLAY_LIMIT)
|
|
512
|
+
const notShown = running.length - shown.length
|
|
513
|
+
const overflow =
|
|
514
|
+
notShown > 0 ? ` ${shown.length} running tasks are shown below, and ${notShown} more.` : ''
|
|
515
|
+
return `Owned delegated work still running (current scheduler observations).${overflow} ${OWNED_WORK_GUIDANCE}\n${JSON.stringify({ tasks: shown.map((taskId) => this.observe(taskId)) })}`
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
/**
|
|
519
|
+
* The tasks this turn launched that have reached a terminal state and are
|
|
520
|
+
* not yet in `recorded` (the ids earlier entries name), oldest first, as
|
|
521
|
+
* text to record. A terminal state does not change, so an entry is never
|
|
522
|
+
* out of date and is written once per task. Tasks that settled and fell
|
|
523
|
+
* out of the bounded list before they were recorded are counted. Undefined
|
|
524
|
+
* when no task has newly settled.
|
|
525
|
+
*/
|
|
526
|
+
describeSettledWork(recorded: ReadonlySet<string>): string | undefined {
|
|
527
|
+
const fresh = this.settledOwned.filter((taskId) => !recorded.has(taskId))
|
|
528
|
+
if (fresh.length === 0) return
|
|
529
|
+
const accounted = new Set<string>([...this.runningOwned, ...fresh])
|
|
530
|
+
for (const taskId of recorded) if (this.ours.has(taskId as TaskId)) accounted.add(taskId)
|
|
531
|
+
const omitted = this.ours.size - accounted.size
|
|
532
|
+
const tasks = fresh.map((taskId) => this.observe(taskId))
|
|
533
|
+
return `Owned delegated work that has finished (as observed when this entry was written; a finished task does not change).${omitted > 0 ? ` ${omitted} more finished tasks are not listed.` : ''} ${OWNED_WORK_GUIDANCE}\n${JSON.stringify({ tasks })}`
|
|
534
|
+
}
|
|
535
|
+
|
|
536
|
+
private observe(taskId: TaskId) {
|
|
537
|
+
let handle = this.unheard.get(taskId)
|
|
538
|
+
try {
|
|
539
|
+
handle = this.gateway?.getTask(taskId) ?? handle
|
|
540
|
+
} catch {
|
|
541
|
+
// A broken observation must not block execution or invent a task state.
|
|
542
|
+
}
|
|
543
|
+
return {
|
|
544
|
+
taskId,
|
|
545
|
+
state: handle?.state ?? 'unknown',
|
|
546
|
+
...(handle?.result?.status ? { turnStatus: handle.result.status } : {}),
|
|
547
|
+
...(handle?.result?.stopReason ? { stopReason: handle.result.stopReason } : {}),
|
|
548
|
+
resultDelivery: this.claimed.has(taskId) ? 'delivered-to-history' : 'not-delivered',
|
|
549
|
+
}
|
|
483
550
|
}
|
|
484
551
|
|
|
485
552
|
/**
|
|
@@ -55,6 +55,11 @@ function shedTexts(messages: unknown): ShedText[] {
|
|
|
55
55
|
const message = plainObject(value)
|
|
56
56
|
if (!message || typeof message.role !== 'string' || !ROLES.has(message.role)) continue
|
|
57
57
|
const role = message.role
|
|
58
|
+
// A recorded context entry is the host's own earlier look at the
|
|
59
|
+
// repository, memory or evidence; indexing it would let a search find
|
|
60
|
+
// its own earlier answer as if it were something said in the session.
|
|
61
|
+
const source = plainObject(message.source)
|
|
62
|
+
if (source?.type === 'runtime-context' && source.kind === 'turn-context') continue
|
|
58
63
|
const tool = metadata[index]
|
|
59
64
|
if (typeof message.content === 'string') {
|
|
60
65
|
const summary =
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { type Message, turnContextEntries } from '../types/message/index.js'
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* The file entries a request's history holds, as the model reads them: the
|
|
5
|
+
* recorded file-evidence entries replayed in order, an entry for a path
|
|
6
|
+
* replacing the earlier one and a path under "No longer holds" dropped.
|
|
7
|
+
* Undefined when none holds.
|
|
8
|
+
*/
|
|
9
|
+
export function heldFileEvidence(messages: readonly Message[] | undefined): unknown[] | undefined {
|
|
10
|
+
const held = new Map<string, unknown>()
|
|
11
|
+
for (const entry of turnContextEntries(messages ?? [], 'file-evidence')) {
|
|
12
|
+
for (const line of entry.split('\n')) {
|
|
13
|
+
if (line.startsWith('No longer holds: ')) {
|
|
14
|
+
for (const path of JSON.parse(line.slice('No longer holds: '.length)) as string[])
|
|
15
|
+
held.delete(path)
|
|
16
|
+
} else if (line.startsWith('[')) {
|
|
17
|
+
for (const item of JSON.parse(line) as { path: string }[]) held.set(item.path, item)
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return held.size > 0 ? [...held.values()] : undefined
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** The recorded file-evidence entries of a history, oldest first. */
|
|
25
|
+
export function fileEvidenceEntries(messages: readonly Message[] | undefined): readonly string[] {
|
|
26
|
+
return turnContextEntries(messages ?? [], 'file-evidence')
|
|
27
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { Message } from '../types/message/index.js'
|
|
2
|
+
|
|
3
|
+
/** True for a block that rides one request only (a runtime-context message of kind `step-context`). */
|
|
4
|
+
export function isRequestOnly(message: Message): boolean {
|
|
5
|
+
return (
|
|
6
|
+
message.role === 'user' &&
|
|
7
|
+
message.source?.type === 'runtime-context' &&
|
|
8
|
+
message.source.kind === 'step-context'
|
|
9
|
+
)
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* The part of a request that is history: every message but the request-only
|
|
14
|
+
* blocks. Each request begins with the history of the one before it, whatever
|
|
15
|
+
* the request-only blocks say.
|
|
16
|
+
*/
|
|
17
|
+
export function historyOf(messages: readonly Message[]): Message[] {
|
|
18
|
+
return messages.filter((message) => !isRequestOnly(message))
|
|
19
|
+
}
|
|
@@ -33,3 +33,23 @@ export function staleFileError(path: string, operation: 'edit' | 'write' = 'edit
|
|
|
33
33
|
export function unreadFileError(path: string, operation: 'edit' | 'write' = 'edit'): string {
|
|
34
34
|
return `${path} has not been read yet. Read it first, then redo the ${operation}. Nothing was written.`
|
|
35
35
|
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Whether the file at `key` has moved on disk since the session read it.
|
|
39
|
+
*
|
|
40
|
+
* The read side of the same comparison `edit` and `write` make when they run,
|
|
41
|
+
* for asking before a reviewer is: `current` is the body now on disk. False
|
|
42
|
+
* when the host keeps no ledger, never read the path (a different refusal, and
|
|
43
|
+
* a read earlier in the same batch may still satisfy it), or cannot fingerprint.
|
|
44
|
+
*/
|
|
45
|
+
export function movedSinceRead(
|
|
46
|
+
tracker:
|
|
47
|
+
| { hasRead(key: string): boolean; fingerprint?(key: string): string | undefined }
|
|
48
|
+
| undefined,
|
|
49
|
+
key: string,
|
|
50
|
+
current: string,
|
|
51
|
+
): boolean {
|
|
52
|
+
if (!tracker || !tracker.hasRead(key)) return false
|
|
53
|
+
const seen = tracker.fingerprint?.(key)
|
|
54
|
+
return seen !== undefined && seen !== fingerprintContent(current)
|
|
55
|
+
}
|