@nodii/dev 0.6.48 → 0.6.50

package/dist/doctor.js

@@ -5,7 +5,7 @@ import { devRequest, encode, isOAuthConfig, query, setAuthProvider } from "./cor
 import { OAuthAuthProvider, decodeClaims, loadRefreshToken } from "./oauth.js";
 import { inferGitContext, repoName } from "./lanes.js";
 import { figmaFileKey, figmaLockCheck, holdsSet, notRegisteredHint, scopeText } from "./figma.js";
-import { PICKER_MODEL, PICKER_MODEL_DIGEST, STALE_PIN_HINT, inspectOllama } from "./gather.js";
+import { PICKER_CONTEXT, PICKER_MODEL, PICKER_MODEL_DIGEST, STALE_PIN_HINT, inspectOllama } from "./gather.js";
 import { hookDiagnostics } from "./hook-doctor.js";
 
 /**
@@ -275,9 +275,16 @@ export async function doctorCommand(deps = {}) {
       }));
     else if (!picker.modelInstalled) checks.push(missing("picker_model", `${PICKER_MODEL} is not installed`, "nodii-dev setup --yes", { model: PICKER_MODEL }));
     else checks.push(missing("picker_model", `${PICKER_MODEL} digest is ${picker.digest ?? "unknown"}; this CLI pins ${PICKER_MODEL_DIGEST}; ${STALE_PIN_HINT}`, "nodii-dev setup --yes", { model: PICKER_MODEL, digest: picker.digest ?? null, requiredDigest: PICKER_MODEL_DIGEST }));
+    // Gather loads the picker at an explicit num_ctx; a copy resident at another
+    // context (Ollama's default is the model's full window) holds far more memory.
+    const context = picker.loadedContext ?? null;
+    if (context === null) checks.push(ok("picker_context", `${PICKER_MODEL} not loaded; Gather loads it with num_ctx ${PICKER_CONTEXT}`, { model: PICKER_MODEL, context: null, requiredContext: PICKER_CONTEXT }));
+    else if (context === PICKER_CONTEXT) checks.push(ok("picker_context", `${PICKER_MODEL} loaded with num_ctx ${PICKER_CONTEXT}`, { model: PICKER_MODEL, context, requiredContext: PICKER_CONTEXT }));
+    else checks.push(missing("picker_context", `${PICKER_MODEL} is loaded with context ${context}, not ${PICKER_CONTEXT}; the next lane gather reloads it`, `ollama stop ${PICKER_MODEL}`, { model: PICKER_MODEL, context, requiredContext: PICKER_CONTEXT }));
   } catch (error) {
     checks.push(missing("ollama", error?.message ?? "Ollama is unavailable", "nodii-dev setup --yes", { code: error?.code ?? null }));
     checks.push(cannot("picker_model", `needs local Ollama; expected ${PICKER_MODEL}`, { model: PICKER_MODEL }));
+    checks.push(cannot("picker_context", `needs local Ollama; expected num_ctx ${PICKER_CONTEXT}`, { model: PICKER_MODEL, requiredContext: PICKER_CONTEXT }));
   }
 
   // 10. Runtime hooks: present, accepted by that runtime, and observed firing.

package/dist/gather.js

@@ -113,12 +113,14 @@ const bareDigest = (digest) => typeof digest === "string" ? digest.replace(/^sha
 
 export async function inspectOllama(options = {}) {
   const pin = options.model ?? PINNED;
-  const [version, tags] = await Promise.all([
+  const [version, tags, ps] = await Promise.all([
     jsonRequest("/api/version", options),
     jsonRequest("/api/tags", options),
+    jsonRequest("/api/ps", options),
   ]);
   const model = (tags.models ?? []).find((x) => x?.name === pin.name || x?.model === pin.name) ?? null;
   return {
+    loadedContext: residentContext(ps, pin.name),
     available: true,
     version: String(version.version ?? "unknown"),
     model: pin.name,
@@ -148,8 +150,12 @@ export async function requirePicker(options = {}) {
  */
 export async function warmPicker(options = {}) {
   const status = await requirePicker(options);
+  const model = (options.model ?? PINNED).name;
+  // Ollama keeps the context a model was loaded with; a later num_ctx does not
+  // reload it (hub-58: resident at 262144). Unload a wrong-context copy first.
+  if (status.loadedContext !== null && status.loadedContext !== PICKER_CONTEXT) await unloadPicker(model, options);
   const started = Date.now();
-  const payload = await jsonRequest("/api/generate", { ...options, timeoutMs: options.timeoutMs ?? PICKER_WARM_TIMEOUT_MS, body: { model: (options.model ?? PINNED).name, prompt: "", stream: false } });
+  const payload = await jsonRequest("/api/generate", { ...options, timeoutMs: options.timeoutMs ?? PICKER_WARM_TIMEOUT_MS, body: { model, prompt: "", stream: false, options: { num_ctx: PICKER_CONTEXT } } });
   return { ...status, latency: pickLatency(payload, Date.now() - started) };
 }
 
@@ -506,6 +512,12 @@ export async function modelLoaded(model, options = {}) {
   return (ps.models ?? []).some((x) => x?.name === model || x?.model === model);
 }
 
+/** The context length Ollama holds the model at (/api/ps), or null when it is not resident. */
+function residentContext(ps, model) {
+  const loaded = (ps.models ?? []).find((x) => x?.name === model || x?.model === model);
+  return loaded ? (loaded.context_length ?? 0) : null;
+}
+
 const tags = (clause) => {
   const repos = clause.repos ?? [];
   const steps = clause.steps ?? [];

package/dist/lane-supervisor.js

@@ -92,7 +92,7 @@ export const doneCheckRecorded = (lane) =>
   || (lane?.steps ?? []).some((step) => step.stepKey === "dev_check" && step.state === "done")
   || FINISHED_LANE.has(lane?.status);
 
-/** A lane is BLOCKED by a blocked step (`lane step --block`) or a latest heartbeat note that says so. */
+/** A lane is BLOCKED by a blocked step (`lane step --block`) or a latest heartbeat note that starts "blocked" or "WAITING:" (AGENT-HARNESS-46). */
 export const laneBlocked = (lane) => Boolean(laneBlockedReason(lane));
 
 /** Why a lane is BLOCKED, or null (the same rule Dev applies to a run's exit). */
@@ -101,7 +101,7 @@ export function laneBlockedReason(lane) {
   if (step) return `Lane step ${step.side}/${step.stepKey} is blocked.`;
   const heartbeat = (lane?.events ?? []).filter((event) => event.type === "heartbeat").at(-1);
   const note = String(heartbeat?.metadata?.note ?? "");
-  return /^\s*blocked\b/i.test(note) ? `Lane heartbeat: ${note.slice(0, 500)}` : null;
+  return /^\s*blocked\b/i.test(note) || /^\s*WAITING\s*:/.test(note) ? `Lane heartbeat: ${note.slice(0, 500)}` : null;
 }
 
 /** The step a lane that stopped early goes back to (hub-58, NODII-DEV-CLI-8/9). */

package/dist/lanes.js

@@ -657,10 +657,20 @@ export async function laneCommand(action, args, flags, { request = devRequest, c
     return { payload, human: `${ref}: subagent quota set to ${quota}.` };
   }
   if (action === "resume") {
+    // AGENT-HARNESS-46: --override resumes a lane the two-deaths rule stopped;
+    // Dev allows it only after a `lane amend`, and keeps the reason on the run.
+    if (flags.override && flags.reason === undefined)
+      throw new CliError("USAGE", "lane resume --override needs --reason TEXT.", 2);
+    if (!flags.override && flags.reason !== undefined)
+      throw new CliError("USAGE", "--reason goes with --override.", 2);
+    if (Array.isArray(flags.reason)) throw new CliError("USAGE", "Give --reason once.", 2);
+    const overrideReason = typeof flags.reason === "string" ? flags.reason.trim() : "";
+    if (flags.override && !overrideReason) throw new CliError("USAGE", "--reason needs TEXT: why resuming the amended lane is safe.", 2);
+    if (overrideReason.length > 2_000) throw new CliError("USAGE", `--reason is ${overrideReason.length} characters; Dev keeps at most 2,000.`, 2);
     const payload = await request(
       "POST",
       `/api/v1/lanes/${encode(id)}/resume`,
-      via,
+      flags.override ? { override: true, reason: overrideReason, ...via } : via,
     );
     let launched;
     try {
@@ -686,7 +696,8 @@ export async function laneCommand(action, args, flags, { request = devRequest, c
         const continuation = next
           ? `${next.side}/${next.step}`
           : "the lane's next unfinished step";
-        return `${ref}: resumed fresh run ${runId} as PID ${launched.pid}; continuing ${continuation} from ${checkpoint}.`;
+        const override = response.data.run.resumeOverrideReason;
+        return `${ref}: resumed fresh run ${runId} as PID ${launched.pid}; continuing ${continuation} from ${checkpoint}.${override ? ` Override past the two-deaths stop recorded ("${override}"); the death count restarts.` : ""}`;
       },
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodii/dev",
-  "version": "0.6.48",
+  "version": "0.6.50",
   "description": "Agent CLI for Nodii Dev, reached through the platform edge",
   "type": "module",
   "bin": {