sneakoscope 4.0.8 → 4.0.10

package/crates/sks-core/Cargo.lock

@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "sks-core"
-version = "4.0.8"
+version = "4.0.9"
 dependencies = [
  "serde_json",
 ]

package/crates/sks-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sks-core"
-version = "4.0.8"
+version = "4.0.9"
 edition = "2021"
 
 [dependencies]

package/crates/sks-core/src/main.rs

@@ -4,7 +4,7 @@ use std::io::{self, Read, Seek, SeekFrom};
 fn main() {
     let mut args = std::env::args().skip(1);
     match args.next().as_deref() {
-        Some("--version") => println!("sks-rs 4.0.8"),
+        Some("--version") => println!("sks-rs 4.0.9"),
         Some("compact-info") => {
             let mut input = String::new();
             let _ = io::stdin().read_to_string(&mut input);

package/dist/bin/sks.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const FAST_PACKAGE_VERSION = '4.0.8';
+const FAST_PACKAGE_VERSION = '4.0.10';
 const args = process.argv.slice(2);
 try {
     if (args[0] === '--agent' && args[1] === 'worker') {

package/dist/cli/command-registry.js

@@ -123,6 +123,7 @@ export const COMMANDS = {
     agent: entry('beta', 'Run native multi-session agent missions', 'dist/core/commands/agent-command.js', argsCommand(() => import('../core/commands/agent-command.js'), 'agentCommand', 'dist/core/commands/agent-command.js')),
     'with-local-llm': entry('beta', 'Enable or inspect local Ollama worker backend', 'dist/core/commands/local-model-command.js', argsCommand(() => import('../core/commands/local-model-command.js'), 'localModelCommand', 'dist/core/commands/local-model-command.js')),
     naruto: entry('labs', 'Run $Naruto shadow-clone swarm (up to 100 parallel sessions)', 'dist/core/commands/naruto-command.js', argsCommand(() => import('../core/commands/naruto-command.js'), 'narutoCommand', 'dist/core/commands/naruto-command.js')),
+    'stop-gate': entry('beta', 'Check canonical stop-gate resolution for a route/mission', 'dist/core/commands/stop-gate-command.js', commandArgsCommand(() => import('../core/commands/stop-gate-command.js'), 'stopGateCommand', 'dist/core/commands/stop-gate-command.js')),
     loop: entry('labs', 'Dynamic Loop Runtime: plan/run/status/proof loop graphs.', 'dist/core/commands/loop-command.js', subcommand(() => import('../core/commands/loop-command.js'), 'loopCommand', 'dist/core/commands/loop-command.js', 'help')),
     'qa-loop': entry('beta', 'Run QA loop missions', 'dist/core/commands/qa-loop-command.js', subcommand(() => import('../core/commands/qa-loop-command.js'), 'qaLoopCommand', 'dist/core/commands/qa-loop-command.js')),
     research: entry('labs', 'Run research missions', 'dist/core/commands/research-command.js', subcommand(() => import('../core/commands/research-command.js'), 'researchCommand', 'dist/core/commands/research-command.js')),

package/dist/core/commands/naruto-command.js

@@ -25,6 +25,7 @@ import { evaluateGitWorktreeCapability } from '../git/git-worktree-capability.js
 import { buildRuntimeProofSummary, renderRuntimeProofSummary } from '../agents/runtime-proof-summary.js';
 import { writeCodex0138CapabilityArtifacts } from '../codex-control/codex-0138-capability.js';
 import { writeCodex0139CapabilityArtifacts } from '../codex-control/codex-0139-capability.js';
+import { writeFinalStopGate } from '../stop-gate/stop-gate-writer.js';
 const NARUTO_RESULT_SCHEMA = 'sks.naruto-command-result.v1';
 const NARUTO_ROUTE = '$Naruto';
 // $Naruto — Shadow Clone Swarm (影分身 / Kage Bunshin no Jutsu).
@@ -34,6 +35,11 @@ const NARUTO_ROUTE = '$Naruto';
 // writes). The standard 20-agent ceiling is lifted only for this route.
 export async function narutoCommand(commandOrArgs = 'naruto', maybeArgs = []) {
     const args = Array.isArray(commandOrArgs) ? commandOrArgs : maybeArgs;
+    // 4.0.9: `sks naruto --glm` delegates to GLM Naruto before legacy Naruto starts.
+    if (args.includes('--glm')) {
+        const { glmNarutoCommand } = await import('../providers/glm/naruto/glm-naruto-command.js');
+        return glmNarutoCommand(args.filter((arg) => arg !== '--glm'));
+    }
     const parsed = parseNarutoArgs(args);
     if (parsed.action === 'help')
         return narutoHelp(parsed);
@@ -450,6 +456,25 @@ async function narutoRun(parsed) {
         stop_gate: 'naruto-gate.json',
         prompt: parsed.prompt
     });
+    // 4.0.9: Write canonical stop-gate artifacts for hook resolution.
+    const narutoGatePassed = result.ok === true && nativeProofOk && finalAccepted && parallelRuntimeOk;
+    await writeFinalStopGate({
+        root,
+        missionId: mission.id,
+        route: 'Naruto',
+        routeCommand: '$Naruto',
+        status: summaryOk ? 'passed' : 'blocked',
+        terminal: summaryOk,
+        terminalState: summaryOk ? 'completed' : 'blocked',
+        evidence: {
+            build_passed: summaryOk,
+            tests_passed: summaryOk,
+            route_evidence_passed: nativeProofOk && finalAccepted,
+            native_session_split_evidence: nativeProofOk ? 'native_agent_proof' : null,
+        },
+        blockers: summaryOk ? [] : [...(result.proof?.blockers || []), ...(parallelRuntimeOk ? [] : ['naruto_parallel_runtime_proof_below_gate'])],
+        nativeGateFile: 'naruto-gate.json',
+    }).catch(() => null);
     const summary = {
         schema: NARUTO_RESULT_SCHEMA,
         ok: summaryOk,

package/dist/core/commands/stop-gate-command.js

@@ -0,0 +1,63 @@
+import { sksRoot } from '../fsx.js';
+import { checkStopGate } from '../stop-gate/stop-gate-check.js';
+export async function stopGateCommand(command, args) {
+    const subcommand = args[0] === 'check' ? 'check' : (args[0] || 'check');
+    const rest = subcommand === 'check' ? args.slice(1) : args;
+    const json = rest.includes('--json');
+    const route = readOption(rest, '--route');
+    const missionId = readOption(rest, '--mission');
+    const gatePath = readOption(rest, '--gate');
+    if (subcommand !== 'check') {
+        const result = {
+            schema: 'sks.stop-gate-command.v1',
+            ok: false,
+            action: 'continue',
+            error: `Unknown subcommand: ${subcommand}. Available: check`,
+        };
+        if (json)
+            console.log(JSON.stringify(result, null, 2));
+        else
+            console.error(`Unknown stop-gate subcommand: ${subcommand}. Use: sks stop-gate check --route Naruto --json`);
+        return result;
+    }
+    const root = await sksRoot();
+    const result = await checkStopGate({
+        root,
+        ...(route ? { route } : {}),
+        ...(missionId ? { missionId } : {}),
+        ...(gatePath ? { explicitGatePath: gatePath } : {}),
+    });
+    if (json) {
+        console.log(JSON.stringify(result, null, 2));
+    }
+    else {
+        if (result.action === 'allow_stop') {
+            console.log(`stop-gate: allow_stop — gate passed at ${result.gate_path}`);
+        }
+        else if (result.action === 'hard_blocked') {
+            console.log(`stop-gate: hard_blocked — ${result.feedback}`);
+        }
+        else {
+            console.error(`stop-gate: continue — ${result.feedback}`);
+        }
+        if (result.diagnostics.checked_paths.length > 0) {
+            console.log('Checked paths:');
+            for (const p of result.diagnostics.checked_paths)
+                console.log(`  ${p}`);
+        }
+        if (result.diagnostics.selected_gate_path) {
+            console.log(`Selected gate: ${result.diagnostics.selected_gate_path}`);
+        }
+    }
+    if (result.action === 'continue')
+        process.exitCode = 1;
+    return result;
+}
+function readOption(args, name) {
+    const index = args.indexOf(name);
+    if (index >= 0 && args[index + 1] && !String(args[index + 1]).startsWith('--'))
+        return args[index + 1];
+    const prefixed = args.find((arg) => String(arg).startsWith(name + '='));
+    return prefixed ? prefixed.slice(name.length + 1) : undefined;
+}
+//# sourceMappingURL=stop-gate-command.js.map

package/dist/core/fsx.js

@@ -5,7 +5,7 @@ import os from 'node:os';
 import crypto from 'node:crypto';
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
-export const PACKAGE_VERSION = '4.0.8';
+export const PACKAGE_VERSION = '4.0.10';
 export const DEFAULT_PROCESS_TAIL_BYTES = 256 * 1024;
 export const DEFAULT_PROCESS_TIMEOUT_MS = 30 * 60 * 1000;
 export function nowIso() {

package/dist/core/pipeline-internals/runtime-gates.js

@@ -17,6 +17,7 @@ import { readAgentGateStatus } from '../agents/agent-gate.js';
 import { MISTAKE_RECALL_ARTIFACT, mistakeRecallGateStatus } from '../mistake-recall.js';
 import { SSOT_GUARD_ARTIFACT, validateSsotGuardArtifact } from '../safety/ssot-guard.js';
 import { validateTeamRuntimeArtifacts } from '../team-dag.js';
+import { checkStopGate } from '../stop-gate/stop-gate-check.js';
 import { clarificationStopReason, context7Evidence, hasContext7DocsEvidence, hasSubagentEvidence, subagentEvidence, } from './runtime-core.js';
 const REFLECTION_ARTIFACT = 'reflection.md';
 const REFLECTION_GATE = 'reflection-gate.json';
@@ -233,10 +234,36 @@ export async function evaluateStop(root, state, payload, opts = {}) {
         return complianceBlock(root, state, `SKS no-question run is not done. Continue autonomously, fix failing checks, update ${gate.file || 'the active gate file'}, and do not ask the user.${missing}`, { gate: gate.file || 'active-gate', missing: gate.missing });
     }
     if (state?.mission_id && state?.stop_gate && !['none', 'honest_mode', 'clarification-gate'].includes(state.stop_gate)) {
-        const gate = await passedActiveGate(root, state);
-        if (!gate.ok) {
-            const missing = gate.missing?.length ? ` Missing gate fields: ${gate.missing.join(', ')}.` : '';
-            return complianceBlock(root, state, `SKS ${state.route_command || state.mode} route cannot stop yet. Pass ${gate.file || state.stop_gate} or record a hard blocker with evidence before finishing.${missing}`, { gate: gate.file || state.stop_gate, missing: gate.missing });
+        // 4.0.9: Use canonical stop-gate resolver first for NARUTO/GLM_NARUTO routes.
+        const modeUpper = String(state?.mode || '').toUpperCase();
+        const routeUpper = String(state?.route || state?.route_command || '').replace(/^\$/, '').toUpperCase();
+        const narutoFamily = modeUpper === 'NARUTO' || routeUpper === 'NARUTO' || routeUpper === 'GLM_NARUTO';
+        if (narutoFamily || state.stop_gate === 'stop-gate.json' || state.stop_gate === 'naruto-gate.json') {
+            const stopCheck = await checkStopGate({
+                root,
+                route: state.route || state.mode,
+                missionId: state.mission_id,
+                explicitGatePath: typeof state.stop_gate_abs_path === 'string' && state.stop_gate_abs_path ? state.stop_gate_abs_path : undefined,
+            });
+            if (stopCheck.action === 'allow_stop') {
+                if (narutoFamily)
+                    return { continue: true, systemMessage: `SKS: canonical stop-gate passed at ${stopCheck.gate_path}` };
+            }
+            else if (stopCheck.action === 'hard_blocked') {
+                return { continue: true, systemMessage: `SKS: ${stopCheck.feedback}` };
+            }
+            else {
+                const missing = stopCheck.diagnostics.missing_fields?.length ? ` Missing gate fields: ${stopCheck.diagnostics.missing_fields.join(', ')}.` : '';
+                const checkedPaths = stopCheck.diagnostics.checked_paths?.length ? ` Checked: ${stopCheck.diagnostics.checked_paths.join(', ')}.` : '';
+                return complianceBlock(root, state, `SKS ${state.route_command || state.mode} route cannot stop yet. Pass ${stopCheck.gate_path || state.stop_gate} or record a hard blocker with evidence before finishing.${missing}${checkedPaths}`, { gate: stopCheck.gate_path || state.stop_gate, missing: stopCheck.diagnostics.missing_fields });
+            }
+        }
+        else {
+            const gate = await passedActiveGate(root, state);
+            if (!gate.ok) {
+                const missing = gate.missing?.length ? ` Missing gate fields: ${gate.missing.join(', ')}.` : '';
+                return complianceBlock(root, state, `SKS ${state.route_command || state.mode} route cannot stop yet. Pass ${gate.file || state.stop_gate} or record a hard blocker with evidence before finishing.${missing}`, { gate: gate.file || state.stop_gate, missing: gate.missing });
+            }
         }
     }
     const proofGate = await routeProofGateStatus(root, state);

package/dist/core/providers/glm/glm-bench.js

@@ -14,7 +14,7 @@ export async function runGlmBench(root, args = []) {
     if (execute && !live) {
         const blocked = {
             schema: 'sks.glm-bench-result.v1',
-            version: '4.0.8',
+            version: '4.0.9',
             generated_at: nowIso(),
             status: 'blocked',
             dry_run: true,
@@ -32,7 +32,7 @@ export async function runGlmBench(root, args = []) {
     if (live) {
         const blocked = {
             schema: 'sks.glm-bench-result.v1',
-            version: '4.0.8',
+            version: '4.0.9',
             generated_at: nowIso(),
             status: 'blocked',
             dry_run: false,
@@ -50,7 +50,7 @@ export async function runGlmBench(root, args = []) {
     if (execute) {
         const blocked = {
             schema: 'sks.glm-bench-result.v1',
-            version: '4.0.8',
+            version: '4.0.9',
             generated_at: nowIso(),
             status: 'blocked',
             dry_run: true,
@@ -69,7 +69,7 @@ export async function runGlmBench(root, args = []) {
     const deepTotals = SYNTHETIC_CASES.map((row) => row.deep.total_ms);
     const result = {
         schema: 'sks.glm-bench-result.v1',
-        version: '4.0.8',
+        version: '4.0.9',
         generated_at: nowIso(),
         status: 'dry_run',
         dry_run: true,

package/dist/core/providers/glm/glm-direct-run.js

@@ -60,7 +60,7 @@ export async function runGlmDirectSpeedRun(input) {
         return result(reason === 'glm_request_timeout' ? 'timeout' : 'failed', controller.state().run_id, input.task, termination.reason, artifactDir, [], [response.error.code], []);
     }
     controller.transition('model_guard');
-    const modelGuard = assertGlm52ActualModel(response.value.model || GLM_52_OPENROUTER_MODEL);
+    const modelGuard = assertGlm52ActualModel(response.value.model);
     if (!modelGuard.ok) {
         const termination = controller.terminate('blocked', 'glm_model_mismatch', [modelGuard.code]);
         const artifactDir = await writeGlmRunArtifacts({ cwd: input.cwd, state: controller.state(), termination, contextOmissions: context.omitted });

package/dist/core/providers/glm/glm-latency-trace.js

@@ -3,7 +3,7 @@ import { nowIso, writeJsonAtomic } from '../../fsx.js';
 export function createEmptyGlmLatencyTrace(mode) {
     return {
         schema: 'sks.glm-latency-trace.v1',
-        version: '4.0.8',
+        version: '4.0.9',
         mode,
         total_ms: 0,
         preflight_ms: 0,

package/dist/core/providers/glm/glm-request-cache.js

@@ -3,8 +3,10 @@ import { SksLruCache } from '../../perf/lru-cache.js';
 export function createGlmEncodedRequestCache(maxEntries = 128) {
     return new SksLruCache(maxEntries);
 }
-export function encodeGlmRequestWithCache(request, cache = defaultEncodedRequestCache) {
-    const key = digestRequestForCache(request);
+export function encodeGlmRequestWithCache(input, cache = defaultEncodedRequestCache) {
+    const request = 'request' in input ? input.request : input;
+    const stringify = 'request' in input && input.stringify ? input.stringify : JSON.stringify;
+    const key = 'request' in input && input.cacheKeyParts ? digestRequestCacheKeyParts(input.cacheKeyParts) : digestRequestForCache(request);
     const hit = cache.get(key);
     // Fix 18.2: On cache hit, return stored body without JSON.stringify
     if (hit) {
@@ -12,11 +14,11 @@ export function encodeGlmRequestWithCache(request, cache = defaultEncodedRequest
             return { body: hit.body, entry: hit, cacheHit: true };
         }
         // Even for non-stored bodies, skip re-stringifying by computing from request
-        const body = JSON.stringify(request);
+        const body = stringify(request);
         return { body, entry: hit, cacheHit: true };
     }
     // Cache miss: stringify once
-    const body = JSON.stringify(request);
+    const body = stringify(request);
     if (containsSecretLikeContent(body)) {
         const entry = {
             key,
@@ -40,6 +42,9 @@ export function encodeGlmRequestWithCache(request, cache = defaultEncodedRequest
     cache.set(key, entry);
     return { body, entry, cacheHit: false };
 }
+export function digestRequestCacheKeyParts(parts) {
+    return crypto.createHash('sha256').update(stableStringify(parts)).digest('hex');
+}
 export function digestRequestForCache(request) {
     const safe = {
         model: request.model,

package/dist/core/providers/glm/naruto/glm-naruto-bench.js

@@ -1,6 +1,10 @@
-import { nowIso, writeJsonAtomic } from '../../../fsx.js';
+import { nowIso } from '../../../fsx.js';
 import path from 'node:path';
+import fsp from 'node:fs/promises';
+import os from 'node:os';
 import { GLM_52_OPENROUTER_MODEL } from '../glm-52-settings.js';
+import { resolveOpenRouterApiKey } from '../../openrouter/openrouter-secret-store.js';
+import { runGlmNarutoMission } from './glm-naruto-orchestrator.js';
 export async function runGlmNarutoBench(root, args = []) {
     const live = args.includes('--live');
     const execute = args.includes('--execute');
@@ -11,7 +15,7 @@ export async function runGlmNarutoBench(root, args = []) {
     if (!live) {
         return {
             schema: 'sks.glm-naruto-bench.v1',
-            version: '4.0.8',
+            version: '4.0.10',
             generated_at: nowIso(),
             status: 'dry_run',
             model: GLM_52_OPENROUTER_MODEL,
@@ -27,29 +31,60 @@ export async function runGlmNarutoBench(root, args = []) {
             warnings: ['dry_run_no_live_api_calls']
         };
     }
-    // Live bench would require OpenRouter key and real API calls
+    const key = await resolveOpenRouterApiKey({ env: process.env });
+    if (!key.key)
+        return blocked(root, ['live_bench_requires_openrouter_key']);
+    const fixture = await fsp.mkdtemp(path.join(os.tmpdir(), 'sks-glm-naruto-live-bench-'));
+    await fsp.mkdir(path.join(fixture, 'src'), { recursive: true });
+    await fsp.writeFile(path.join(fixture, 'src', 'bench-target.ts'), 'export const value = 1;\n', 'utf8');
+    const cases = [];
+    for (const workers of [1, 4, 8, 12]) {
+        const caseStarted = Date.now();
+        const result = await runGlmNarutoMission({
+            cwd: fixture,
+            task: 'Change src/bench-target.ts so value is 2. Return the smallest patch only.',
+            args: ['--bench', '--live', '--no-apply'],
+            missionId: `glm-naruto-live-bench-${workers}-${Date.now()}`,
+            maxWorkers: workers,
+            noApply: true
+        });
+        cases.push({
+            name: workers === 1 ? 'direct single GLM' : `GLM Naruto ${workers} workers`,
+            workers,
+            wall_clock_ms: Date.now() - caseStarted,
+            p50_ttft_ms: null,
+            p90_ttft_ms: null,
+            candidate_count: result.patch_candidates,
+            gate_pass_rate: result.patch_candidates ? result.gate_passed_candidates / result.patch_candidates : 0,
+            verifier_pass_rate: 0,
+            merge_success: result.mergeable_candidates > 0,
+            cached_tokens: 0,
+            cache_write_tokens: 0
+        });
+    }
     return {
         schema: 'sks.glm-naruto-bench.v1',
-        version: '4.0.8',
+        version: '4.0.10',
         generated_at: nowIso(),
-        status: 'blocked',
+        status: 'live',
         model: GLM_52_OPENROUTER_MODEL,
         gpt_fallback_allowed: false,
+        cases,
         summary: {
-            simulated_workers: 0,
-            simulated_waves: 0,
-            simulated_patch_candidates: 0,
-            simulated_gate_passed: 0,
-            simulated_mergeable: 0,
+            simulated_workers: Math.max(...cases.map((row) => row.workers)),
+            simulated_waves: cases.length,
+            simulated_patch_candidates: cases.reduce((sum, row) => sum + row.candidate_count, 0),
+            simulated_gate_passed: cases.reduce((sum, row) => sum + Math.round(row.candidate_count * row.gate_pass_rate), 0),
+            simulated_mergeable: cases.filter((row) => row.merge_success).length,
             wall_clock_ms: Date.now() - started
         },
-        warnings: ['live_bench_requires_openrouter_key_and_task']
+        warnings: ['live_bench_no_apply_temp_repo']
     };
 }
 function blocked(root, warnings) {
     return {
         schema: 'sks.glm-naruto-bench.v1',
-        version: '4.0.8',
+        version: '4.0.10',
         generated_at: nowIso(),
         status: 'blocked',
         model: GLM_52_OPENROUTER_MODEL,

package/dist/core/providers/glm/naruto/glm-naruto-combined-patch.js

@@ -0,0 +1,49 @@
+import { checkAndApplyGlmPatch } from '../glm-patch-apply.js';
+export function combineGlmNarutoPatches(envelopes, selectedPatchIds) {
+    const selected = selectedPatchIds
+        .map((patchId) => envelopes.find((env) => env.worker_id === patchId || env.patch_sha256 === patchId))
+        .filter((env) => Boolean(env))
+        .sort((a, b) => a.worker_id.localeCompare(b.worker_id));
+    return mergeDiffSections(selected.flatMap((env) => splitDiffSections(env.patch)));
+}
+export async function checkAndApplyCombinedGlmNarutoPatch(input) {
+    const patch = combineGlmNarutoPatches(input.envelopes, input.selectedPatchIds);
+    if (!patch.trim())
+        return { ok: false, patch, applied: [], blocker: 'combined_patch_empty' };
+    const checked = await checkAndApplyGlmPatch({ cwd: input.cwd, patch, apply: input.apply });
+    if (!checked.ok)
+        return { ok: false, patch, applied: [], blocker: checked.error.code };
+    return { ok: true, patch, applied: input.selectedPatchIds };
+}
+function mergeDiffSections(sections) {
+    const byFile = new Map();
+    for (const section of sections)
+        byFile.set(section.file, [...(byFile.get(section.file) || []), section]);
+    const merged = [];
+    for (const [file] of byFile) {
+        const group = byFile.get(file);
+        const first = group[0];
+        merged.push([...first.header, ...group.flatMap((section) => section.hunks)].join('\n').trimEnd());
+    }
+    return merged.filter(Boolean).join('\n\n') + (merged.length ? '\n' : '');
+}
+function splitDiffSections(patch) {
+    const rawSections = patch
+        .split(/(?=^diff --git )/m)
+        .map((section) => section.trim())
+        .filter(Boolean);
+    return rawSections.map((section) => {
+        const lines = section.split(/\r?\n/);
+        const diff = lines[0]?.match(/^diff --git a\/(.+?) b\/(.+)$/);
+        const file = diff?.[2] || diff?.[1] || lines[0] || 'unknown';
+        const firstHunk = lines.findIndex((line) => line.startsWith('@@ '));
+        if (firstHunk < 0)
+            return { file, header: lines, hunks: [] };
+        return {
+            file,
+            header: lines.slice(0, firstHunk),
+            hunks: lines.slice(firstHunk)
+        };
+    });
+}
+//# sourceMappingURL=glm-naruto-combined-patch.js.map

package/dist/core/providers/glm/naruto/glm-naruto-conflict-graph.js

@@ -1,3 +1,4 @@
+import { envelopesHaveHunkConflict } from './glm-naruto-hunk-conflict.js';
 export function buildConflictGraph(envelopes, nodes) {
     const edges = [];
     for (let i = 0; i < nodes.length; i++) {
@@ -23,11 +24,16 @@ function detectConflict(left, right, envelopes) {
     if (leftEnv && rightEnv && leftEnv.base_digest !== rightEnv.base_digest) {
         return { left_patch_id: left.patch_id, right_patch_id: right.patch_id, reason: 'base_digest_mismatch' };
     }
+    if (left.shard_id === right.shard_id) {
+        return { left_patch_id: left.patch_id, right_patch_id: right.patch_id, reason: 'same_hunk' };
+    }
     const leftPaths = new Set(left.target_paths);
     const rightPaths = new Set(right.target_paths);
     const sharedFiles = [...leftPaths].filter((p) => rightPaths.has(p));
     if (sharedFiles.length > 0) {
-        if (left.shard_id === right.shard_id) {
+        if (leftEnv && rightEnv) {
+            if (!envelopesHaveHunkConflict(leftEnv, rightEnv))
+                return null;
             return { left_patch_id: left.patch_id, right_patch_id: right.patch_id, reason: 'same_hunk' };
         }
         return { left_patch_id: left.patch_id, right_patch_id: right.patch_id, reason: 'same_file' };

package/dist/core/providers/glm/naruto/glm-naruto-hunk-conflict.js

@@ -0,0 +1,16 @@
+import { hunksOverlap, parseUnifiedDiffHunks } from './glm-naruto-hunk-parser.js';
+export function envelopesHaveHunkConflict(left, right) {
+    const leftHunks = parseUnifiedDiffHunks(left.patch);
+    const rightHunks = parseUnifiedDiffHunks(right.patch);
+    if (leftHunks.length === 0 || rightHunks.length === 0)
+        return sharesPath(left, right);
+    return leftHunks.some((leftHunk) => rightHunks.some((rightHunk) => hunksOverlap(leftHunk, rightHunk)));
+}
+export function envelopesShareFileButNotHunk(left, right) {
+    return sharesPath(left, right) && !envelopesHaveHunkConflict(left, right);
+}
+function sharesPath(left, right) {
+    const rightPaths = new Set(right.target_paths);
+    return left.target_paths.some((file) => rightPaths.has(file));
+}
+//# sourceMappingURL=glm-naruto-hunk-conflict.js.map

package/dist/core/providers/glm/naruto/glm-naruto-hunk-parser.js

@@ -0,0 +1,36 @@
+export function parseUnifiedDiffHunks(patch) {
+    const hunks = [];
+    let currentFile = null;
+    for (const line of patch.split(/\r?\n/)) {
+        const diff = line.match(/^diff --git a\/(.+?) b\/(.+)$/);
+        if (diff?.[2]) {
+            currentFile = diff[2];
+            continue;
+        }
+        const file = line.match(/^\+\+\+ b\/(.+)$/);
+        if (file?.[1] && file[1] !== '/dev/null')
+            currentFile = file[1];
+        const hunk = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$/);
+        if (hunk && currentFile) {
+            hunks.push({
+                file: currentFile,
+                old_start: Number(hunk[1]),
+                old_lines: Number(hunk[2] || 1),
+                new_start: Number(hunk[3]),
+                new_lines: Number(hunk[4] || 1),
+                header: line
+            });
+        }
+    }
+    return hunks;
+}
+export function hunksOverlap(left, right) {
+    if (left.file !== right.file)
+        return false;
+    return rangesOverlap(left.old_start, left.old_start + Math.max(1, left.old_lines) - 1, right.old_start, right.old_start + Math.max(1, right.old_lines) - 1)
+        || rangesOverlap(left.new_start, left.new_start + Math.max(1, left.new_lines) - 1, right.new_start, right.new_start + Math.max(1, right.new_lines) - 1);
+}
+function rangesOverlap(aStart, aEnd, bStart, bEnd) {
+    return aStart <= bEnd && bStart <= aEnd;
+}
+//# sourceMappingURL=glm-naruto-hunk-parser.js.map

package/dist/core/providers/glm/naruto/glm-naruto-judge.js

@@ -48,7 +48,7 @@ export async function runGlmJudge(input) {
     if (!response.ok) {
         return fallbackJudgeResult(validEnvelopes, [`judge_request_failed:${response.error.code}`]);
     }
-    const modelGuard = assertGlm52ActualModel(response.value.model || GLM_52_OPENROUTER_MODEL);
+    const modelGuard = assertGlm52ActualModel(response.value.model);
     if (!modelGuard.ok) {
         return fallbackJudgeResult(validEnvelopes, [`judge_model_guard:${modelGuard.code}`]);
     }