neoctl 0.2.30 → 0.2.32

package/dist/core/context-metrics.js

@@ -59,30 +59,36 @@ export function buildContextMetrics(input) {
         estimatedChars = serialized.length;
         estimatedInputTokens = estimateTextTokens(serialized);
     }
-    const window = resolveContextWindowTokens(input.model);
+    const resolvedWindow = resolveContextWindowTokens(input.model);
+    const contextWindowTokensOverride = normalizePositiveInteger(input.contextWindowTokensOverride);
+    const contextWindowTokens = contextWindowTokensOverride ?? resolvedWindow.tokens;
+    const contextWindowSource = contextWindowTokensOverride ? "session" : resolvedWindow.source;
     return {
         model: input.model,
         estimatedInputTokens,
         estimatedChars,
         messageCount: input.messages.length,
         toolCount: input.tools.length,
-        contextWindowTokens: window.tokens,
-        contextWindowSource: window.source,
-        contextUsageRatio: window.tokens ? estimatedInputTokens / window.tokens : undefined,
+        contextWindowTokens,
+        contextWindowSource,
+        contextUsageRatio: contextWindowTokens ? estimatedInputTokens / contextWindowTokens : undefined,
         cacheDiagnostics: input.cacheDiagnostics,
-        modelMetadata: window.model
+        modelMetadata: resolvedWindow.model
             ? {
-                id: window.model.id,
-                provider: window.model.provider,
-                maxOutputTokens: window.model.maxOutputTokens,
-                knowledgeCutoff: window.model.knowledgeCutoff,
-                reasoning: window.model.reasoning,
-                imageInput: window.model.imageInput,
-                source: window.model.source,
+                id: resolvedWindow.model.id,
+                provider: resolvedWindow.model.provider,
+                maxOutputTokens: resolvedWindow.model.maxOutputTokens,
+                knowledgeCutoff: resolvedWindow.model.knowledgeCutoff,
+                reasoning: resolvedWindow.model.reasoning,
+                imageInput: resolvedWindow.model.imageInput,
+                source: resolvedWindow.model.source,
             }
             : undefined,
     };
 }
+function normalizePositiveInteger(value) {
+    return Number.isInteger(value) && Number(value) > 0 ? Number(value) : undefined;
+}
 export function estimateTextTokens(text) {
     if (!text)
         return 0;

package/dist/core/context-metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-metrics.js","sourceRoot":"","sources":["../../src/core/context-metrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context-metrics.js","sourceRoot":"","sources":["../../src/core/context-metrics.ts"],"names":[],"mappings":"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"}

package/dist/core/image-registry.d.ts

@@ -1,12 +1,17 @@
 import type { Message } from "../types/messages.js";
 import { type ImageNote } from "./image-notes.js";
 export interface ImageEntry {
+    /** Stable human-friendly alias persisted in compact boundaries (for example img_3). */
     id: string;
+    /** Immutable image occurrence identity stored on the source message block. */
+    imageId?: string;
     label?: string;
     mimeType: string;
     storagePath?: string;
     storageFormat?: "base64" | "data-url";
+    contentHash?: string;
     sourceMessageId: string;
+    sourceBlockIndex?: number;
     sourceRole: string;
     origin: "user" | "generated" | "tool" | "unknown";
     /** Approximate index within the conversation timeline. */
@@ -41,7 +46,15 @@ export declare function formatImageRegistryForContext(registry: ImageRegistry):
  * Load the raw base64 data for an image entry. Returns undefined if unreadable.
  */
 export declare function loadImageData(entry: ImageEntry): string | undefined;
-/**
- * Resolve an image reference (id like "img_3", label, or storage path) against a registry.
- */
+export type ImageRefResolution = {
+    status: "resolved";
+    entry: ImageEntry;
+} | {
+    status: "not-found";
+} | {
+    status: "ambiguous";
+    candidates: ImageEntry[];
+};
+/** Resolve exact identities first. Display labels and path suffixes only resolve when unique. */
+export declare function resolveImageRefResult(registry: ImageRegistry, ref: string): ImageRefResolution;
 export declare function resolveImageRef(registry: ImageRegistry, ref: string): ImageEntry | undefined;

package/dist/core/image-registry.js

@@ -1,4 +1,4 @@
-import { readFileSync } from "node:fs";
+import { resolveStoredImageDataSync } from "./image-storage.js";
 import { readImageNoteForStoragePathSync } from "./image-notes.js";
 /**
  * Scan messages and build a registry of all images encountered.
@@ -9,17 +9,20 @@ export function buildImageRegistry(messages, startingTurnIndex = 0) {
     let turnIndex = startingTurnIndex;
     for (const message of messages) {
         const sourceTextSnippet = extractMessageTextSnippet(message);
-        for (const block of message.blocks) {
+        for (const [sourceBlockIndex, block] of message.blocks.entries()) {
             if (block.type !== "image")
                 continue;
             const storagePath = block.storage?.path;
             images.push({
                 id: `img_${images.length + 1}`,
+                imageId: block.imageId,
                 label: block.label,
                 mimeType: block.mimeType,
                 storagePath,
                 storageFormat: block.storage?.format,
+                contentHash: block.storage?.contentHash,
                 sourceMessageId: message.id,
+                sourceBlockIndex,
                 sourceRole: message.role,
                 origin: inferImageOrigin(message, block),
                 turnIndex,
@@ -37,20 +40,30 @@ export function buildImageRegistry(messages, startingTurnIndex = 0) {
  */
 export function mergeImageRegistries(previous, current) {
     const seen = new Set();
+    const usedAliases = new Set();
     const merged = [];
+    let nextAlias = Math.max(0, ...previous.images.map((entry) => numericImageAlias(entry.id))) + 1;
     for (const entry of previous.images) {
-        const key = entry.storagePath ?? `${entry.sourceMessageId}:${entry.label}`;
+        const key = imageEntryKey(entry);
         if (seen.has(key))
             continue;
+        if (usedAliases.has(entry.id.toLowerCase()))
+            throw new Error(`Duplicate image registry id: ${entry.id}`);
         seen.add(key);
+        usedAliases.add(entry.id.toLowerCase());
         merged.push(entry);
     }
     for (const entry of current.images) {
-        const key = entry.storagePath ?? `${entry.sourceMessageId}:${entry.label}`;
+        const key = imageEntryKey(entry);
         if (seen.has(key))
             continue;
+        while (usedAliases.has(`img_${nextAlias}`))
+            nextAlias += 1;
+        const id = `img_${nextAlias}`;
+        nextAlias += 1;
         seen.add(key);
-        merged.push({ ...entry, id: `img_${merged.length + 1}` });
+        usedAliases.add(id);
+        merged.push({ ...entry, id });
     }
     return { images: merged };
 }
@@ -92,42 +105,64 @@ export function formatImageRegistryForContext(registry) {
 export function loadImageData(entry) {
     if (!entry.storagePath)
         return undefined;
-    try {
-        return readFileSync(entry.storagePath, "utf8");
-    }
-    catch {
-        return undefined;
-    }
+    return resolveStoredImageDataSync({
+        path: entry.storagePath,
+        format: entry.storageFormat,
+        contentHash: entry.contentHash,
+    });
 }
-/**
- * Resolve an image reference (id like "img_3", label, or storage path) against a registry.
- */
-export function resolveImageRef(registry, ref) {
+/** Resolve exact identities first. Display labels and path suffixes only resolve when unique. */
+export function resolveImageRefResult(registry, ref) {
     const normalized = ref.trim().toLowerCase();
-    const byId = registry.images.find((e) => e.id.toLowerCase() === normalized);
-    if (byId)
-        return byId;
+    if (!normalized)
+        return { status: "not-found" };
+    const exactIdentity = uniqueResolution(registry.images.filter((entry) => entry.id.toLowerCase() === normalized || entry.imageId?.toLowerCase() === normalized));
+    if (exactIdentity.status !== "not-found")
+        return exactIdentity;
     const genMatch = /^\[?gen#?(\d+)\]?$/i.exec(normalized);
     if (genMatch) {
         const canonical = `gen#${Number(genMatch[1])}`;
-        const generated = registry.images.find((e) => e.label?.toLowerCase() === canonical);
-        if (generated)
+        const generated = uniqueResolution(registry.images.filter((entry) => entry.label?.toLowerCase() === canonical));
+        if (generated.status !== "not-found")
             return generated;
     }
-    const numMatch = /^(?:\[?img[_#]?|image\s*)?(\d+)\]?$/i.exec(normalized);
+    const normalizedLabel = normalizeImageRefText(ref);
+    const byLabel = uniqueResolution(registry.images.filter((entry) => normalizeImageRefText(entry.label) === normalizedLabel));
+    if (byLabel.status !== "not-found")
+        return byLabel;
+    const byPath = uniqueResolution(registry.images.filter((entry) => entry.storagePath?.toLowerCase() === normalized || entry.storagePath?.toLowerCase().endsWith(normalized)));
+    if (byPath.status !== "not-found")
+        return byPath;
+    // Compatibility fallback for old bare numeric references. It is intentionally last.
+    const numMatch = /^(?:image\s*)?(\d+)$/i.exec(normalized);
     if (numMatch) {
         const idx = Number(numMatch[1]) - 1;
         if (idx >= 0 && idx < registry.images.length)
-            return registry.images[idx];
+            return { status: "resolved", entry: registry.images[idx] };
     }
-    const byLabel = registry.images.find((e) => normalizeImageRefText(e.label) === normalized || normalizeImageRefText(e.label) === normalizeImageRefText(ref));
-    if (byLabel)
-        return byLabel;
-    const byPath = registry.images.find((e) => e.storagePath?.toLowerCase() === normalized ||
-        e.storagePath?.toLowerCase().endsWith(normalized));
-    if (byPath)
-        return byPath;
-    return undefined;
+    return { status: "not-found" };
+}
+export function resolveImageRef(registry, ref) {
+    const result = resolveImageRefResult(registry, ref);
+    return result.status === "resolved" ? result.entry : undefined;
+}
+function uniqueResolution(candidates) {
+    if (candidates.length === 0)
+        return { status: "not-found" };
+    if (candidates.length === 1)
+        return { status: "resolved", entry: candidates[0] };
+    return { status: "ambiguous", candidates };
+}
+function imageEntryKey(entry) {
+    if (entry.imageId)
+        return `imageId:${entry.imageId.toLowerCase()}`;
+    if (entry.storagePath)
+        return `path:${entry.storagePath.toLowerCase()}`;
+    return `block:${entry.sourceMessageId}:${entry.sourceBlockIndex ?? entry.label ?? "unknown"}`;
+}
+function numericImageAlias(id) {
+    const match = /^img_(\d+)$/iu.exec(id);
+    return match ? Number(match[1]) : 0;
 }
 function normalizeImageRefText(value) {
     return (value ?? "").trim().toLowerCase().replace(/^\[/u, "").replace(/\]$/u, "").replace(/^img#/u, "img_");

package/dist/core/image-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-registry.js","sourceRoot":"","sources":["../../src/core/image-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"image-registry.js","sourceRoot":"","sources":["../../src/core/image-registry.ts"],"names":[],"mappings":"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"}

package/dist/core/image-storage.d.ts

@@ -1,4 +1,4 @@
-import type { MessageBlock } from "../types/messages.js";
+import { type MessageBlock } from "../types/messages.js";
 export interface PersistMessageImagesOptions {
     sessionDir?: string;
     agentId?: string;
@@ -6,12 +6,26 @@ export interface PersistMessageImagesOptions {
 type ImageStorageLike = {
     path: string;
     format?: string;
+    contentHash?: string;
+    storedBytes?: number;
+};
+export type ImageDataResolution = {
+    available: true;
+    data: string;
+} | {
+    available: false;
+    error: "missing-payload" | "storage-unreadable" | "storage-size-mismatch" | "invalid-payload" | "content-hash-mismatch";
 };
 export declare function resolveStoredImageDataSync(storage: ImageStorageLike | undefined): string | undefined;
+export declare function resolveStoredImageDataResultSync(storage: ImageStorageLike | undefined): ImageDataResolution;
 export declare function resolveImageBlockDataSync(block: {
     data: string;
     storage?: ImageStorageLike;
 }): string | undefined;
+export declare function resolveImageBlockDataResultSync(block: {
+    data: string;
+    storage?: ImageStorageLike;
+}): ImageDataResolution;
 export declare function resolveImageBlockDataLengthSync(block: {
     data: string;
     storage?: ImageStorageLike;

package/dist/core/image-storage.js

@@ -1,22 +1,55 @@
+import { createHash } from "node:crypto";
 import { readFileSync, statSync } from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { getNeoctlHome } from "../paths.js";
+import { createImageId } from "../types/messages.js";
 export function resolveStoredImageDataSync(storage) {
+    const resolved = resolveStoredImageDataResultSync(storage);
+    return resolved.available ? resolved.data : undefined;
+}
+export function resolveStoredImageDataResultSync(storage) {
     if (!storage?.path)
-        return undefined;
+        return { available: false, error: "missing-payload" };
+    let data;
     try {
-        return readFileSync(storage.path, "utf8");
+        data = readFileSync(storage.path, "utf8");
     }
     catch {
-        return undefined;
+        return { available: false, error: "storage-unreadable" };
+    }
+    if (storage.storedBytes !== undefined && Buffer.byteLength(data, "utf8") !== storage.storedBytes) {
+        return { available: false, error: "storage-size-mismatch" };
     }
+    const parsed = parseImagePayload(data);
+    if (!parsed)
+        return { available: false, error: "invalid-payload" };
+    if (storage.contentHash && hashBytes(parsed.bytes) !== storage.contentHash) {
+        return { available: false, error: "content-hash-mismatch" };
+    }
+    return { available: true, data };
 }
 export function resolveImageBlockDataSync(block) {
+    const resolved = resolveImageBlockDataResultSync(block);
+    return resolved.available ? resolved.data : undefined;
+}
+export function resolveImageBlockDataResultSync(block) {
     const inline = block.data.trim();
-    if (inline)
-        return inline;
-    return resolveStoredImageDataSync(block.storage);
+    if (!inline)
+        return resolveStoredImageDataResultSync(block.storage);
+    const inlinePayload = parseImagePayload(inline);
+    if (!inlinePayload)
+        return { available: false, error: "invalid-payload" };
+    if (!block.storage?.path)
+        return { available: true, data: inline };
+    const stored = resolveStoredImageDataResultSync(block.storage);
+    if (!stored.available)
+        return stored;
+    const storedPayload = parseImagePayload(stored.data);
+    if (!storedPayload || hashBytes(storedPayload.bytes) !== hashBytes(inlinePayload.bytes)) {
+        return { available: false, error: "content-hash-mismatch" };
+    }
+    return { available: true, data: inline };
 }
 export function resolveImageBlockDataLengthSync(block) {
     const inline = block.data.trim();
@@ -34,36 +67,126 @@ export function resolveImageBlockDataLengthSync(block) {
 export async function persistMessageImages(blocks, options = {}) {
     let changed = false;
     const persisted = [];
-    let imageIndex = 0;
     for (const block of blocks) {
-        if (block.type !== "image" || block.storage?.path) {
+        if (block.type !== "image") {
             persisted.push(block);
             continue;
         }
-        imageIndex += 1;
-        const stored = await persistImageBlock(block, imageIndex, options);
+        const stored = await persistImageBlock(block, options);
         persisted.push(stored);
-        changed = true;
+        if (stored !== block)
+            changed = true;
     }
     return changed ? persisted : [...blocks];
 }
-async function persistImageBlock(block, imageIndex, options) {
+async function persistImageBlock(block, options) {
+    const imageId = block.imageId?.trim() || createImageId();
+    const inline = block.data.trim();
+    if (block.storage?.path) {
+        const storedData = await fs.readFile(block.storage.path, "utf8");
+        const parsed = requireValidImagePayload(storedData, block.mimeType);
+        const contentHash = hashBytes(parsed.bytes);
+        const storedBytes = Buffer.byteLength(storedData, "utf8");
+        if (inline) {
+            const inlineParsed = requireValidImagePayload(inline, block.mimeType);
+            if (hashBytes(inlineParsed.bytes) !== contentHash)
+                throw new Error(`Inline and stored image payload differ for ${imageId}`);
+        }
+        const unchanged = block.imageId === imageId
+            && !inline
+            && block.storage.contentHash === contentHash
+            && block.storage.storedBytes === storedBytes;
+        if (unchanged)
+            return block;
+        return {
+            ...block,
+            imageId,
+            data: "",
+            storage: { ...block.storage, contentHash, storedBytes },
+        };
+    }
+    const parsed = requireValidImagePayload(inline, block.mimeType);
+    const contentHash = hashBytes(parsed.bytes);
+    const storedBytes = Buffer.byteLength(inline, "utf8");
     const directory = options.sessionDir
         ? path.join(options.sessionDir, "attachments", "images")
         : path.join(getNeoctlHome(), "attachments", options.agentId ?? "main", "images");
     await fs.mkdir(directory, { recursive: true });
-    const filePath = path.join(directory, `${new Date().toISOString().replace(/[:.]/g, "-")}-${imageIndex}-${randomSuffix()}.base64.txt`);
-    await fs.writeFile(filePath, block.data, "utf8");
+    const filePath = path.join(directory, `${safeImageId(imageId)}-${contentHash.slice(0, 12)}.base64.txt`);
+    const temporaryPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
+    try {
+        await writeAndSync(temporaryPath, inline);
+        const verifyData = await fs.readFile(temporaryPath, "utf8");
+        const verified = requireValidImagePayload(verifyData, block.mimeType);
+        if (Buffer.byteLength(verifyData, "utf8") !== storedBytes || hashBytes(verified.bytes) !== contentHash) {
+            throw new Error(`Image persistence verification failed for ${imageId}`);
+        }
+        await fs.rename(temporaryPath, filePath);
+        await syncFile(filePath);
+    }
+    catch (error) {
+        await fs.rm(temporaryPath, { force: true }).catch(() => undefined);
+        throw error;
+    }
     return {
         ...block,
+        imageId,
         data: "",
         storage: {
             path: filePath,
-            format: block.data.trimStart().startsWith("data:") ? "data-url" : "base64",
+            format: parsed.format,
+            contentHash,
+            storedBytes,
         },
     };
 }
-function randomSuffix() {
-    return Math.random().toString(36).slice(2, 8);
+async function writeAndSync(filePath, data) {
+    const handle = await fs.open(filePath, "wx");
+    try {
+        await handle.writeFile(data, "utf8");
+        await handle.sync();
+    }
+    finally {
+        await handle.close();
+    }
+}
+async function syncFile(filePath) {
+    const handle = await fs.open(filePath, "r+");
+    try {
+        await handle.sync();
+    }
+    finally {
+        await handle.close();
+    }
+}
+function requireValidImagePayload(data, expectedMimeType) {
+    const parsed = parseImagePayload(data);
+    if (!parsed)
+        throw new Error("Image payload must be non-empty, valid base64 data");
+    if (!expectedMimeType.toLowerCase().startsWith("image/"))
+        throw new Error(`Invalid image MIME type: ${expectedMimeType}`);
+    if (parsed.mimeType && parsed.mimeType.toLowerCase() !== expectedMimeType.toLowerCase()) {
+        throw new Error(`Image MIME type mismatch: block=${expectedMimeType}, payload=${parsed.mimeType}`);
+    }
+    return { bytes: parsed.bytes, format: parsed.format };
+}
+function parseImagePayload(data) {
+    const trimmed = data.trim();
+    if (!trimmed)
+        return undefined;
+    const dataUrl = /^data:([^;,]+);base64,([\s\S]*)$/iu.exec(trimmed);
+    const encoded = (dataUrl?.[2] ?? trimmed).replace(/\s+/gu, "");
+    if (!encoded || encoded.length % 4 !== 0 || !/^[A-Za-z0-9+/]*={0,2}$/u.test(encoded))
+        return undefined;
+    const bytes = Buffer.from(encoded, "base64");
+    if (!bytes.length || bytes.toString("base64").replace(/=+$/u, "") !== encoded.replace(/=+$/u, ""))
+        return undefined;
+    return { bytes, format: dataUrl ? "data-url" : "base64", mimeType: dataUrl?.[1] };
+}
+function hashBytes(bytes) {
+    return createHash("sha256").update(bytes).digest("hex");
+}
+function safeImageId(imageId) {
+    return imageId.replace(/[^A-Za-z0-9._-]/gu, "_");
 }
 //# sourceMappingURL=image-storage.js.map

package/dist/core/image-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-storage.js","sourceRoot":"","sources":["../../src/core/image-storage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"image-storage.js","sourceRoot":"","sources":["../../src/core/image-storage.ts"],"names":[],"mappings":"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"}

package/dist/core/message-pipeline.js

@@ -4,7 +4,10 @@ export function getMessagesAfterCompactBoundary(messages) {
     const lastBoundary = findLastIndex(messages, (message) => message.metadata?.compactBoundary === true);
     if (lastBoundary < 0)
         return [...messages];
-    return messages.slice(lastBoundary);
+    let start = lastBoundary;
+    while (start > 0 && messages[start - 1].metadata?.compactPreservedUser === true)
+        start -= 1;
+    return messages.slice(start);
 }
 export function applyToolResultBudget(messages, options = {}) {
     const maxSerializedLength = options.maxSerializedLength ?? 16000;
@@ -160,7 +163,17 @@ export function applyRuntimeContextForPromptCache(messages, userContext, systemC
     const dynamicContextMessage = dynamicContext
         ? { ...dynamicContext, metadata: { ...dynamicContext.metadata, cacheStableRuntimeContext: false } }
         : undefined;
-    return [stableContextMessage, dynamicContextMessage, ...messages].filter((message) => Boolean(message));
+    const stableMessages = [stableContextMessage, ...messages].filter((message) => Boolean(message));
+    if (!dynamicContextMessage)
+        return stableMessages;
+    const latestUserIndex = findLastIndex(stableMessages, (message) => message.role === "user" && !message.isMeta);
+    if (latestUserIndex < 0)
+        return [...stableMessages, dynamicContextMessage];
+    return [
+        ...stableMessages.slice(0, latestUserIndex),
+        dynamicContextMessage,
+        ...stableMessages.slice(latestUserIndex),
+    ];
 }
 export function insertRuntimeContextBeforeLatestUser(messages, userContext, systemContext) {
     const contextMessage = createRuntimeContextMessage(userContext, systemContext);
@@ -183,9 +196,10 @@ export function appendSystemContext(systemPrompt, systemContext) {
     return `${systemPrompt}\n\n## System Context\n${rendered}`;
 }
 function splitSystemContextForPromptCache(systemContext) {
+    const entries = Object.entries(systemContext).filter(([, value]) => value !== undefined);
     return {
-        stableSystemContext: Object.fromEntries(Object.entries(systemContext).filter(([, value]) => value !== undefined)),
-        dynamicSystemContext: {},
+        stableSystemContext: Object.fromEntries(entries.filter(([key]) => key !== "cwd")),
+        dynamicSystemContext: Object.fromEntries(entries.filter(([key]) => key === "cwd")),
     };
 }
 function renderObjectEntries(entries) {