fix: 修复 push/pop 巡检报出的三处逻辑问题

- parsePopArgs 用正则严格校验整数,拒绝 2junk/1.5 等被 parseInt 静默截断的非法序号
- 非交互会话 partial 压缩失败回退 full 时补发通知,避免 push 标记被静默丢弃
- resume 时 push 点失效通知统一为英文,与兄弟通知一致
- 补充 2junk/1.5 回归测试

Co-Authored-By: claude-opus-4-8[1m] <noreply@anthropic.com>

Author: universe-hcy

src/commands/__tests__/pushpop.test.ts

@@ -81,6 +81,18 @@ describe('parsePopArgs', () => {
     expect(result as string).toMatch(/Invalid marker/)
   })
 
+  test('--to 2junk rejects trailing garbage (no partial parseInt)', () => {
+    const result = parsePopArgs('--to 2junk')
+    expect(typeof result).toBe('string')
+    expect(result as string).toMatch(/Invalid marker/)
+  })
+
+  test('--to=1.5 rejects non-integer', () => {
+    const result = parsePopArgs('--to=1.5')
+    expect(typeof result).toBe('string')
+    expect(result as string).toMatch(/Invalid marker/)
+  })
+
   test('unknown flag returns error string', () => {
     const result = parsePopArgs('--unknown')
     expect(typeof result).toBe('string')

src/commands/pop/pop.ts

@@ -2,6 +2,19 @@ import type { LocalCommandResult } from '../../commands.js'
 import type { ToolUseContext } from '../../Tool.js'
 import type { PopOptions } from '../../services/pushStack/state.js'
 
+/**
+ * Parses a marker argument (`#N` or `N`) into a positive ordinal. Rejects any
+ * input that is not a pure integer — `Number.parseInt` would otherwise silently
+ * accept `2junk` (→2) or `1.5` (→1) and pop the wrong branch. Returns null on
+ * any malformed value.
+ */
+function parseMarkerOrdinal(raw: string): number | null {
+  const digits = raw.replace(/^#/, '')
+  if (!/^\d+$/.test(digits)) return null
+  const n = Number.parseInt(digits, 10)
+  return Number.isInteger(n) && n >= 1 ? n : null
+}
+
 /**
  * Parses `/pop` flags into PopOptions. Recognized:
  *   --to #N | --to N   cross-layer pop back to marker ordinal N (§4.7)
@@ -22,12 +35,12 @@ export function parsePopArgs(args: string): PopOptions | string {
       const next = tokens[++i]
       if (next === undefined)
         return 'Missing marker number after --to (e.g. /pop --to #1).'
-      const n = Number.parseInt(next.replace(/^#/, ''), 10)
-      if (!Number.isInteger(n) || n < 1) return `Invalid marker number: ${next}`
+      const n = parseMarkerOrdinal(next)
+      if (n === null) return `Invalid marker number: ${next}`
       opts.to = n
     } else if (tok.startsWith('--to=')) {
-      const n = Number.parseInt(tok.slice('--to='.length).replace(/^#/, ''), 10)
-      if (!Number.isInteger(n) || n < 1) return `Invalid marker number: ${tok}`
+      const n = parseMarkerOrdinal(tok.slice('--to='.length))
+      if (n === null) return `Invalid marker number: ${tok}`
       opts.to = n
     } else {
       return `Unknown option: ${tok}`

src/screens/REPL.tsx

@@ -2375,7 +2375,7 @@ export function REPL({
           if (droppedCount > 0) {
             addNotification({
               key: 'push-stack-resume-dropped',
-              text: `${droppedCount} 个 push 点在恢复后已失效（被压缩/snip 卷走），已移除`,
+              text: `${droppedCount} push point(s) became invalid after resume (carried off by compaction/snip) and were removed.`,
               priority: 'medium',
               timeoutMs: 6000,
             });

src/services/compact/autoCompact.ts

@@ -446,19 +446,22 @@ export async function autoCompactIfNeeded(
             }
           }
         }
-        // goFull or partial failed — warn before running full compaction.
-        if (isInteractive && !goFull) {
-          // Partial failed silently; full compaction will clear all markers.
+        // goFull or partial failed — warn before running full compaction. This
+        // must fire in non-interactive sessions too: otherwise a partial
+        // failure there would drop every push marker silently, violating the
+        // "never silently lose a stack marker" invariant.
+        if (goFull) {
           toolUseContext.addNotification?.({
-            key: 'autocompact-push-full-fallback',
-            text: `Auto-compacted (partial failed); all ${stack.length} push point(s) are now invalid. Use /rewind if needed.`,
+            key: 'autocompact-push-full',
+            text: `Full auto-compact: all ${stack.length} push point(s) have been removed.`,
             priority: 'medium',
             timeoutMs: 10000,
           })
-        } else if (goFull) {
+        } else {
+          // Partial failed/unavailable; full compaction will clear all markers.
           toolUseContext.addNotification?.({
-            key: 'autocompact-push-full',
-            text: `Full auto-compact: all ${stack.length} push point(s) have been removed.`,
+            key: 'autocompact-push-full-fallback',
+            text: `Auto-compacted (partial failed); all ${stack.length} push point(s) are now invalid. Use /rewind if needed.`,
             priority: 'medium',
             timeoutMs: 10000,
           })