@oh-my-pi/pi-coding-agent 18.12.4 → 18.12.5

package/dist/types/tools/conflict-detect.d.ts

@@ -30,20 +30,28 @@ import type { ToolSession } from "./index.js";
  * the read.
  */
 export declare function scanConflictLines(lines: readonly string[], firstLineNumber: number): ConflictBlock[];
+/** Result of {@link scanFileForConflicts}. */
+export interface ConflictFileScan {
+    blocks: ConflictBlock[];
+    /** First line the byte cap left unscanned (possibly partial); unset when the whole file was scanned. */
+    truncatedAtLine?: number;
+}
 /**
  * Scan a whole file for unresolved conflict blocks.
  *
  * Reads at most `maxBytes` (default 10 MB) so this stays cheap on
- * pathological files. Files truncated by the cap report
- * `scanTruncated: true`; only complete blocks within the scanned prefix
- * are returned, so trailing partial markers never invent fake blocks.
+ * pathological files. Files truncated by the cap report the line the scan
+ * stopped at; only complete blocks within the scanned prefix are returned,
+ * so trailing partial markers never invent fake blocks.
  */
 export declare function scanFileForConflicts(absolutePath: string, options?: {
     maxBytes?: number;
-}): Promise<{
-    blocks: ConflictBlock[];
-    scanTruncated: boolean;
-}>;
+}): Promise<ConflictFileScan>;
+/**
+ * Note for a scan the byte cap stopped at `line`: `:conflicts` cannot list or
+ * register blocks from there on, but a ranged read that shows them registers them.
+ */
+export declare function formatScanCapNote(displayPath: string, line: number): string;
 /** Per-session log of conflict regions surfaced by `read`. */
 export declare class ConflictHistory {
     #private;
@@ -180,8 +188,8 @@ export interface FormatConflictWarningOptions {
     totalInFile?: number;
     /** Display path used inside the `:conflicts` hint. */
     displayPath?: string;
-    /** Whether the underlying file scan hit its byte cap. */
-    scanTruncated?: boolean;
+    /** Line where the underlying file scan hit its byte cap, if it did. */
+    truncatedAtLine?: number;
 }
 export declare function formatConflictWarning(entries: readonly ConflictEntry[], options?: FormatConflictWarningOptions): string;
 /**
@@ -191,5 +199,5 @@ export declare function formatConflictWarning(entries: readonly ConflictEntry[],
  */
 export declare function formatConflictSummary(entries: readonly ConflictEntry[], options?: {
     displayPath: string;
-    scanTruncated?: boolean;
+    truncatedAtLine?: number;
 }): string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "18.12.4",
+	"version": "18.12.5",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"keywords": [
 		"agent",
@@ -543,17 +543,17 @@
 	},
 	"dependencies": {
 		"@babel/parser": "^7.29.7",
-		"@oh-my-pi/omp-stats": "18.12.4",
-		"@oh-my-pi/omptype": "18.12.4",
-		"@oh-my-pi/pi-agent-core": "18.12.4",
-		"@oh-my-pi/pi-ai": "18.12.4",
-		"@oh-my-pi/pi-catalog": "18.12.4",
-		"@oh-my-pi/pi-mnemopi": "18.12.4",
-		"@oh-my-pi/pi-natives": "18.12.4",
-		"@oh-my-pi/pi-tui": "18.12.4",
-		"@oh-my-pi/pi-utils": "18.12.4",
-		"@oh-my-pi/pi-wire": "18.12.4",
-		"@oh-my-pi/snapcompact": "18.12.4",
+		"@oh-my-pi/omp-stats": "18.12.5",
+		"@oh-my-pi/omptype": "18.12.5",
+		"@oh-my-pi/pi-agent-core": "18.12.5",
+		"@oh-my-pi/pi-ai": "18.12.5",
+		"@oh-my-pi/pi-catalog": "18.12.5",
+		"@oh-my-pi/pi-mnemopi": "18.12.5",
+		"@oh-my-pi/pi-natives": "18.12.5",
+		"@oh-my-pi/pi-tui": "18.12.5",
+		"@oh-my-pi/pi-utils": "18.12.5",
+		"@oh-my-pi/pi-wire": "18.12.5",
+		"@oh-my-pi/snapcompact": "18.12.5",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/api-logs": "^0.220.0",
 		"@opentelemetry/context-async-hooks": "^2.9.0",

package/src/cli/update-cli.ts

@@ -739,7 +739,6 @@ async function fetchLatestManifest(
 		}
 		return manifest;
 	};
-	const isPackument = (body: unknown): boolean => isRecord(body) && isRecord(body["dist-tags"]);
 
 	let response = await get(npmRegistryPackageUrl(registry, pkg, tag));
 	let data: unknown;
@@ -752,10 +751,16 @@ async function fetchLatestManifest(
 			if (!origin || !(err instanceof SyntaxError)) throw err;
 			useFullPackument = true;
 		}
-		if (isPackument(data)) {
-			// Some registries (e.g. Sonatype Nexus) answer the dist-tag shortcut
-			// with the full packument instead of the tagged version manifest.
-			data = fromPackument(data);
+		const distTags = isRecord(data) ? data["dist-tags"] : undefined;
+		if (isRecord(distTags)) {
+			if (typeof distTags[tag] === "string" || !origin) {
+				// Some registries answer the dist-tag shortcut with a full packument.
+				data = fromPackument(data);
+			} else {
+				// Artifactory can add empty packument fields to a tagged manifest;
+				// its full packument may select a different, installable version.
+				useFullPackument = true;
+			}
 		} else if (origin && !(isRecord(data) && typeof data.version === "string")) {
 			useFullPackument = true;
 		}

package/src/discovery/builtin-rules/ts-import-type.md

@@ -2,7 +2,7 @@
 description: "Use `import type`, not `import('pkg').Type` in type positions"
 condition:
   - "\\btypeof\\s+import\\("
-  - "\\bimport\\((?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:\"[^\"\\n]*\"|'[^'\\n]*'|\\x60[^\\x60]*\\x60)(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:,[^()]*)?\\)\\s*(?:\\[\\s*[\"']|\\.\\s*(?!(?:then|catch|finally)\\b)[A-Za-z_$][\\w$]*(?=[^\\w$]))"
+  - "\\bimport\\((?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:\"[^\"\\n]*\"|'[^'\\n]*'|\\x60[^\\x60]*\\x60)(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:,[^()]*)?\\)\\s*(?:\\[\\s*[\"']|\\.\\s*(?!(?:then|catch|finally)(?![\\w$\\u0080-\\uffff]))[A-Za-z_$\\u0080-\\uffff][\\w$\\u0080-\\uffff]*(?=[^\\w$\\u0080-\\uffff]))"
 scope: "tool:edit(*.ts), tool:edit(*.tsx), tool:write(*.ts), tool:write(*.tsx)"
 interruptMode: never
 ---

package/src/discovery/builtin-rules/ts-set-map.md

@@ -2,7 +2,7 @@
 description: Prefer Record<K, V> for small static literals; use Set/Map for anything dynamic
 condition:
   - "\\bnew\\s+Set\\s*(?:<(?:[^<>;()=]|=>?|<[^<>;]*>|\\([^()]*\\))*>)?\\s*\\((?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\[(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60$\\\\]|\\\\[\\s\\S]|\\$(?!\\{))*\\x60)(?:(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60$\\\\]|\\\\[\\s\\S]|\\$(?!\\{))*\\x60))*(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,?(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\]"
-  - "\\bnew\\s+Map\\s*(?:<(?:[^<>;()=]|=>?|<[^<>;]*>|\\([^()]*\\))*>)?\\s*\\((?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\[(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\[(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60$\\\\]|\\\\[\\s\\S]|\\$(?!\\{))*\\x60)(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,(?:[^\\[\\]\"'\\x60]|\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60\\\\]|\\\\[\\s\\S])*\\x60|\\[[^\\[\\]]*\\])*\\](?:(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\[(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60$\\\\]|\\\\[\\s\\S]|\\$(?!\\{))*\\x60)(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,(?:[^\\[\\]\"'\\x60]|\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60\\\\]|\\\\[\\s\\S])*\\x60|\\[[^\\[\\]]*\\])*\\])*(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,?(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\]"
+  - "\\bnew\\s+Map(?![^\\n]{1000})\\s*(?:<(?:[^<>;()=]|=>?|<[^<>;]*>|\\([^()]*\\))*>)?\\s*\\((?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\[(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\[(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60$\\\\]|\\\\[\\s\\S]|\\$(?!\\{))*\\x60)(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,(?:[^\\[\\]\"'\\x60]|\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60\\\\]|\\\\[\\s\\S])*\\x60|\\[[^\\[\\]]*\\])*\\](?:\\s*as\\s+const\\b)?(?:(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\[(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*(?:\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60$\\\\]|\\\\[\\s\\S]|\\$(?!\\{))*\\x60)(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,(?:[^\\[\\]\"'\\x60]|\"(?:[^\"\\\\\\n]|\\\\.)*\"|'(?:[^'\\\\\\n]|\\\\.)*'|\\x60(?:[^\\x60\\\\]|\\\\[\\s\\S])*\\x60|\\[[^\\[\\]]*\\])*\\](?:\\s*as\\s+const\\b)?)*(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*,?(?:\\s|//.*|/\\*(?:[^*]|\\*(?!/))*\\*/)*\\]"
 scope: "tool:edit(**/*.{ts,tsx}), tool:write(**/*.{ts,tsx})"
 interruptMode: never
 ---

package/src/session/settings.ts

@@ -1167,8 +1167,9 @@ export const cfgProvidersCacheRetention = register({
 			},
 			{
 				value: "long",
-				label: "Long (1h)",
-				description: "1h TTL where the provider supports it; pricier writes, only warmed during active runs",
+				label: "Long (1h+)",
+				description:
+					"Longer TTL where supported (Anthropic/Bedrock 1h, OpenAI GPT-5.6+ Responses 12h); pricier writes, only warmed during active runs",
 			},
 			{ value: "none", label: "Off", description: "Disable prompt caching and cache-affinity routing" },
 		],

package/src/task/index.ts

@@ -792,6 +792,17 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 		};
 	}
 
+	/**
+	 * Thinking override for a spawn. `task.enableEffort` gates the caller's
+	 * `effort` at runtime, not only in the advertised schema: stale transcripts
+	 * and lenient argument fallbacks still deliver the field, and honoring it
+	 * would override the agent's configured thinking selector.
+	 */
+	#effortParams(params: TaskParams): Pick<StructuredSubagentRequest, "effort"> {
+		if (params.effort === undefined || !cfgTaskEnableEffort.get(this.session.settings)) return {};
+		return { effort: params.effort };
+	}
+
 	#seanceSchemaFields() {
 		const spawnPolicy = resolveSpawnPolicy(this.session.getSessionSpawns());
 		const planMode = this.session.getPlanModeState?.()?.enabled === true;
@@ -911,7 +922,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 			sourceSession: params.sourceSession,
 			model: params.model,
 			...this.#resultParams(params),
-			...(params.effort !== undefined ? { effort: params.effort } : {}),
+			...this.#effortParams(params),
 			...("isolated" in params ? { isolation: { requested: params.isolated } } : {}),
 			blockedAgent: this.#blockedAgent,
 			enableLsp: (this.session.enableLsp ?? true) && cfgTaskEnableLsp.get(this.session.settings),
@@ -1738,7 +1749,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 				sourceSession: params.sourceSession,
 				model: params.model,
 				...this.#resultParams(params),
-				...(params.effort !== undefined ? { effort: params.effort } : {}),
+				...this.#effortParams(params),
 				solutionSpace: params.solutionSpace,
 				...(params.tools?.length
 					? {

package/src/tools/conflict-detect.ts

@@ -123,18 +123,25 @@ export function scanConflictLines(lines: readonly string[], firstLineNumber: num
 
 const SCAN_FILE_DEFAULT_MAX_BYTES = 10 * 1024 * 1024;
 
+/** Result of {@link scanFileForConflicts}. */
+export interface ConflictFileScan {
+	blocks: ConflictBlock[];
+	/** First line the byte cap left unscanned (possibly partial); unset when the whole file was scanned. */
+	truncatedAtLine?: number;
+}
+
 /**
  * Scan a whole file for unresolved conflict blocks.
  *
  * Reads at most `maxBytes` (default 10 MB) so this stays cheap on
- * pathological files. Files truncated by the cap report
- * `scanTruncated: true`; only complete blocks within the scanned prefix
- * are returned, so trailing partial markers never invent fake blocks.
+ * pathological files. Files truncated by the cap report the line the scan
+ * stopped at; only complete blocks within the scanned prefix are returned,
+ * so trailing partial markers never invent fake blocks.
  */
 export async function scanFileForConflicts(
 	absolutePath: string,
 	options: { maxBytes?: number } = {},
-): Promise<{ blocks: ConflictBlock[]; scanTruncated: boolean }> {
+): Promise<ConflictFileScan> {
 	const maxBytes = options.maxBytes ?? SCAN_FILE_DEFAULT_MAX_BYTES;
 	const file = Bun.file(absolutePath);
 	const size = file.size;
@@ -144,7 +151,16 @@ export async function scanFileForConflicts(
 	// `split("\n")` over a truncated read may leave a partial last line; the
 	// scanner already tolerates an unclosed opener, so no extra trimming.
 	const lines = text.split("\n");
-	return { blocks: scanConflictLines(lines, 1), scanTruncated: truncated };
+	const blocks = scanConflictLines(lines, 1);
+	return truncated ? { blocks, truncatedAtLine: lines.length } : { blocks };
+}
+
+/**
+ * Note for a scan the byte cap stopped at `line`: `:conflicts` cannot list or
+ * register blocks from there on, but a ranged read that shows them registers them.
+ */
+export function formatScanCapNote(displayPath: string, line: number): string {
+	return `- note: the conflict scan stopped at the byte cap at line ${line}; blocks from there on are not counted or registered here — range-read \`${displayPath}:${line}-\` to show and register them.`;
 }
 
 /**
@@ -593,8 +609,8 @@ export interface FormatConflictWarningOptions {
 	totalInFile?: number;
 	/** Display path used inside the `:conflicts` hint. */
 	displayPath?: string;
-	/** Whether the underlying file scan hit its byte cap. */
-	scanTruncated?: boolean;
+	/** Line where the underlying file scan hit its byte cap, if it did. */
+	truncatedAtLine?: number;
 }
 
 export function formatConflictWarning(
@@ -615,8 +631,8 @@ export function formatConflictWarning(
 	} else {
 		out.push(`⚠ ${total} unresolved ${word} detected`);
 	}
-	if (options.scanTruncated) {
-		out.push("- note: file scan hit the byte cap; additional conflicts may exist beyond the scanned prefix.");
+	if (options.truncatedAtLine !== undefined) {
+		out.push(formatScanCapNote(options.displayPath ?? "<file>", options.truncatedAtLine));
 	}
 
 	const oursLabel = pickLabel(entries, e => e.oursLabel);
@@ -679,14 +695,14 @@ export function formatConflictWarning(
  */
 export function formatConflictSummary(
 	entries: readonly ConflictEntry[],
-	options: { displayPath: string; scanTruncated?: boolean } = { displayPath: "" },
+	options: { displayPath: string; truncatedAtLine?: number } = { displayPath: "" },
 ): string {
 	const lines: string[] = [];
 	const total = entries.length;
 	const word = total === 1 ? "conflict" : "conflicts";
 	lines.push(`⚠ ${total} unresolved ${word} in ${options.displayPath || "<file>"}`);
-	if (options.scanTruncated) {
-		lines.push("- note: file scan hit the byte cap; additional conflicts may exist beyond the scanned prefix.");
+	if (options.truncatedAtLine !== undefined) {
+		lines.push(formatScanCapNote(options.displayPath || "<file>", options.truncatedAtLine));
 	}
 	const oursLabel = pickLabel(entries, e => e.oursLabel);
 	const theirsLabel = pickLabel(entries, e => e.theirsLabel);

package/src/tools/read.ts

@@ -77,6 +77,7 @@ import { buildDirectoryTree, type DirectoryTree } from "../workspace-tree";
 import {
 	formatConflictSummary,
 	formatConflictWarning,
+	formatScanCapNote,
 	getConflictHistory,
 	recoverConflictUriPrefix,
 	scanConflictLines,
@@ -2760,18 +2761,18 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 							// Cheap full-file scan only when the window already showed
 							// at least one conflict — otherwise pay nothing on clean files.
 							let totalInFile = entries.length;
-							let scanTruncated = false;
+							let truncatedAtLine: number | undefined;
 							try {
 								const fileScan = await scanFileForConflicts(absolutePath);
 								totalInFile = Math.max(entries.length, fileScan.blocks.length);
-								scanTruncated = fileScan.scanTruncated;
+								truncatedAtLine = fileScan.truncatedAtLine;
 							} catch {
 								// Best-effort enrichment; fall back to window-only count.
 							}
 							outputText += formatConflictWarning(entries, {
 								totalInFile,
 								displayPath: displayPathForWarning,
-								scanTruncated,
+								truncatedAtLine,
 							});
 							details.conflictCount = entries.length;
 						}
@@ -2853,10 +2854,14 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 			}),
 		);
 
-		const summary =
-			entries.length === 0
-				? `No unresolved git merge conflicts in ${displayPath}.`
-				: formatConflictSummary(entries, { displayPath, scanTruncated: scan.scanTruncated });
+		let summary: string;
+		if (entries.length > 0) {
+			summary = formatConflictSummary(entries, { displayPath, truncatedAtLine: scan.truncatedAtLine });
+		} else if (scan.truncatedAtLine !== undefined) {
+			summary = `No unresolved git merge conflicts before line ${scan.truncatedAtLine} of ${displayPath}.\n${formatScanCapNote(displayPath, scan.truncatedAtLine)}`;
+		} else {
+			summary = `No unresolved git merge conflicts in ${displayPath}.`;
+		}
 
 		const details: ReadToolDetails = {
 			resolvedPath: absolutePath,