acp-kernel 0.0.96 → 0.0.97-pr.466.328

package/LICENSE

@@ -19,3 +19,39 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+---
+
+Additional Term — Attribution on Product Surfaces
+(在 MIT 之上附加的条款 —— 产品出处标注)
+
+In addition to the conditions above, if you use or incorporate the Software
+in a product or service that end users can see or interact with — whether
+commercial or open source — you must make attribution clearly visible in at
+least one of the following places:
+
+  1. the product's home page;
+  2. its documentation; or
+  3. its "About" / "Credits" / "Acknowledgements" page.
+
+The attribution must state that the product uses acp-kernel (and
+billion-context, where applicable) and include a link to
+https://github.com/ranxianglei/acp-kernel (and
+https://github.com/ranxianglei/billion-context, where applicable).
+
+For purely server-side or embedded uses with no user-facing surface, carrying
+these notices in the shipped documentation satisfies this term.
+
+附加条款（中文）：
+
+除上述条件外，若将本软件用于任何终端用户可见或可交互的产品或服务（无论商业或开源），
+须在下述至少一处显著位置标明出处：
+
+  1. 产品首页；
+  2. 产品文档；或
+  3. “关于 / 致谢 / Acknowledgements”页面。
+
+署名须说明该产品使用了 acp-kernel（涉及时包括 billion-context），并附指向
+https://github.com/ranxianglei/acp-kernel （及 https://github.com/ranxianglei/billion-context，
+涉及时）的链接。纯服务端或内嵌、无用户可见界面的用途，随附文档中包含上述声明即可。
+

package/README.md

@@ -298,6 +298,12 @@ to decide between message-level and wire-level surgery.
 
 > **Protected tool messages:** protected tool calls (per `config.protectedTools`) and their paired tool-results are hard-excluded from compression — they are dropped from the compressible set and from the new block's `effectiveMessageIds`, so they stay fully visible and are never folded into a summary. This matches opencode-acp's Bug 39 fix. The soft-protected recent zone (`preserveRecentMessages` / last user message) is handled separately: messages there are excluded from the range but do not fail it (an entirely-protected range fails with a clear error).
 
+## Attribution requirement (one term on top of MIT)
+
+`acp-kernel` is MIT-licensed **plus one additional term**: any product or service (commercial or open source) whose users can see or interact with it and which uses this kernel must attribute it — stating that it uses acp-kernel with a link back to this repository — on its home page, documentation, or About/Credits page. Pure server-side/embedded use satisfies this via shipped documentation. See the **Additional Term** at the end of [LICENSE](LICENSE).
+
+If you build on this kernel, we'd love to hear about it: open an issue (no obligation) so we can track where it's used.
+
 ## License
 
 MIT © ranxianglei

package/dist/index.js

@@ -290,44 +290,10 @@ function stripOrphanedReasoning(messages) {
   return messages.filter((_, i) => !drop.has(i));
 }
 
-// src/instance-reid.ts
-var CONTENT_HASH_ROOT = /^h_([0-9a-f]{16})(?:_\d+)?(?:#.*)?$/;
-function clusterRoot(id) {
-  const m = CONTENT_HASH_ROOT.exec(id);
-  return m ? `h_${m[1]}` : null;
-}
-function remintCoveredLiveIds(messages, state) {
-  const covered = /* @__PURE__ */ new Set();
-  for (const id of coveredMessageIds(state)) covered.add(baseIdOf(id));
-  if (covered.size === 0) return messages;
-  const groups = /* @__PURE__ */ new Map();
-  for (let i = 0; i < messages.length; i++) {
-    const root = clusterRoot(messages[i].id);
-    if (root === null) continue;
-    const idxs = groups.get(root);
-    if (idxs) idxs.push(i);
-    else groups.set(root, [i]);
-  }
-  const next = [...messages];
-  let changed = false;
-  for (const [root, idxs] of groups) {
-    const conflict = idxs.some((i) => covered.has(baseIdOf(messages[i].id)));
-    if (!conflict) continue;
-    let k = 1;
-    for (const i of idxs) {
-      while (covered.has(`${root}_${k}`)) k++;
-      const id = messages[i].id;
-      const hash = id.indexOf("#");
-      const tail = hash > 0 ? id.slice(hash) : "";
-      next[i] = { ...messages[i], id: `${root}_${k}${tail}` };
-      k++;
-      changed = true;
-    }
-  }
-  return changed ? next : messages;
-}
-
 // src/sync.ts
+function isBlockStillPresent(block, presentBases, presentIds) {
+  return block.effectiveMessageIds.some((id) => presentBases.has(baseIdOf(id))) || presentIds.has(summaryMessageId(block.blockId));
+}
 function syncBlocks(messages, state) {
   const presentIds = new Set(messages.map((message) => message.id));
   const presentBases = /* @__PURE__ */ new Set();
@@ -383,8 +349,7 @@ function syncBlocks(messages, state) {
       continue;
     }
     block.active = true;
-    const stillPresent = block.effectiveMessageIds.some((id) => presentBases.has(baseIdOf(id))) || presentIds.has(summaryMessageId(block.blockId));
-    if (!stillPresent) {
+    if (!isBlockStillPresent(block, presentBases, presentIds)) {
       block.active = false;
       deactivated.push(block.blockId);
     }
@@ -392,6 +357,101 @@ function syncBlocks(messages, state) {
   return { state: result, deactivated };
 }
 
+// src/instance-reid.ts
+var CONTENT_HASH_ROOT = /^h_([0-9a-f]{16})(?:_\d+)?(?:#.*)?$/;
+function clusterRoot(id) {
+  const m = CONTENT_HASH_ROOT.exec(id);
+  return m ? `h_${m[1]}` : null;
+}
+function instanceNumber(id, root) {
+  if (!id.startsWith(`${root}_`)) return null;
+  const n = Number(id.slice(root.length + 1));
+  return Number.isInteger(n) && n > 0 ? n : null;
+}
+function remintCoveredLiveIds(messages, state) {
+  const liveBases = /* @__PURE__ */ new Set();
+  const liveIds = /* @__PURE__ */ new Set();
+  for (const message of messages) {
+    if (typeof message.id !== "string") continue;
+    liveIds.add(message.id);
+    liveBases.add(baseIdOf(message.id));
+  }
+  const consumed = /* @__PURE__ */ new Set();
+  for (const block of state.blocks) {
+    for (const id of block.directBlockIds) consumed.add(id);
+  }
+  const coverersByBase = /* @__PURE__ */ new Map();
+  const coveredBases = /* @__PURE__ */ new Set();
+  let anyCoverage = false;
+  for (const block of state.blocks) {
+    if (consumed.has(block.blockId) || block.expanded) continue;
+    if (!isBlockStillPresent(block, liveBases, liveIds)) continue;
+    const bases = /* @__PURE__ */ new Set();
+    for (const id of block.effectiveMessageIds) bases.add(baseIdOf(id));
+    let allPresent = bases.size > 0;
+    for (const base of bases) {
+      if (!liveBases.has(base)) {
+        allPresent = false;
+        break;
+      }
+    }
+    const replaying = allPresent && !liveIds.has(summaryMessageId(block.blockId));
+    anyCoverage = true;
+    for (const base of bases) {
+      coveredBases.add(base);
+      const flags = coverersByBase.get(base);
+      if (flags) flags.push(replaying);
+      else coverersByBase.set(base, [replaying]);
+    }
+  }
+  if (!anyCoverage) return messages;
+  const groups = /* @__PURE__ */ new Map();
+  for (let i = 0; i < messages.length; i++) {
+    const id = messages[i].id;
+    if (typeof id !== "string") continue;
+    const root = clusterRoot(id);
+    if (root === null) continue;
+    const idxs = groups.get(root);
+    if (idxs) idxs.push(i);
+    else groups.set(root, [i]);
+  }
+  const next = [...messages];
+  let changed = false;
+  for (const [root, idxs] of groups) {
+    const remintIdx = [];
+    for (const i of idxs) {
+      const flags = coverersByBase.get(baseIdOf(messages[i].id));
+      if (!flags) continue;
+      const positionalReplay = flags.every((replaying) => replaying);
+      if (positionalReplay) continue;
+      remintIdx.push(i);
+    }
+    if (remintIdx.length === 0) continue;
+    const reminting = new Set(remintIdx);
+    const taken = /* @__PURE__ */ new Set();
+    for (const base of coveredBases) {
+      const n = instanceNumber(base, root);
+      if (n !== null) taken.add(n);
+    }
+    for (const i of idxs) {
+      if (reminting.has(i)) continue;
+      const n = instanceNumber(baseIdOf(messages[i].id), root);
+      if (n !== null) taken.add(n);
+    }
+    let k = 1;
+    for (const i of remintIdx) {
+      while (taken.has(k)) k++;
+      const id = messages[i].id;
+      const hash = id.indexOf("#");
+      const tail = hash > 0 ? id.slice(hash) : "";
+      next[i] = { ...messages[i], id: `${root}_${k}${tail}` };
+      taken.add(k);
+      changed = true;
+    }
+  }
+  return changed ? next : messages;
+}
+
 // src/config.ts
 function defaultConfig(modelContextLimit, overrides = {}) {
   const base = {