@narumitw/pi-btw 0.61.0 → 0.61.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@narumitw/pi-btw",
3
- "version": "0.61.0",
3
+ "version": "0.61.2",
4
4
  "description": "Pi extension that adds a /btw side-question command.",
5
5
  "type": "module",
6
6
  "license": "MIT",
@@ -32,9 +32,9 @@
32
32
  "prepack": "npm run build"
33
33
  },
34
34
  "devDependencies": {
35
- "@earendil-works/pi-ai": "0.86.0",
36
- "@earendil-works/pi-coding-agent": "0.86.0",
37
- "@earendil-works/pi-tui": "0.86.0",
35
+ "@earendil-works/pi-ai": "1.2.0",
36
+ "@earendil-works/pi-coding-agent": "1.2.0",
37
+ "@earendil-works/pi-tui": "1.2.0",
38
38
  "esbuild": "0.28.2",
39
39
  "typescript": "7.0.2"
40
40
  },
@@ -258,6 +258,12 @@ function normalizedKeyId(key: string): string {
258
258
  const parts = key.toLowerCase().split("+");
259
259
  const base = parts.at(-1);
260
260
  if (!base) return "";
261
+ const configuredModifiers = parts.slice(0, -1);
262
+ if (
263
+ new Set(configuredModifiers).size !== configuredModifiers.length ||
264
+ configuredModifiers.some((modifier) => !KEY_MODIFIER_ORDER.includes(modifier as never))
265
+ )
266
+ return "";
261
267
  const normalizedBase = base === "esc" ? "escape" : base === "return" ? "enter" : base;
262
268
  const modifiers = KEY_MODIFIER_ORDER.filter((modifier) => parts.includes(modifier));
263
269
  return [...modifiers, normalizedBase].join("+");
@@ -48,7 +48,7 @@ const LEGACY_INPUTS = [
48
48
  ...FUNCTION_INPUTS.map((suffix) => `\u001b${suffix}`),
49
49
  ];
50
50
 
51
- /** Strict settings syntax; Pi itself ignores unknown/duplicate modifier tokens. */
51
+ /** Strict settings syntax; reject unknown and duplicate modifier tokens. */
52
52
  export function normalizeBtwKey(value: unknown): string | undefined {
53
53
  if (typeof value !== "string" || value.length > 80 || /[\s\p{Cc}]/u.test(value)) return undefined;
54
54
  const parts = value.toLowerCase().split("+");
@@ -245,6 +245,8 @@ function sanitizeEntryForDisplay(entry: SessionEntry): SessionEntry {
245
245
  return { ...entry, thinkingLevel: sanitizeSingleLine(entry.thinkingLevel) };
246
246
  case "custom":
247
247
  return { ...entry, customType: sanitizeSingleLine(entry.customType) };
248
+ case "context_edit":
249
+ return { ...entry, targetId: sanitizeSingleLine(entry.targetId) };
248
250
  case "label":
249
251
  return {
250
252
  ...entry,
@@ -1,3 +1,4 @@
1
+ import { randomUUID } from "node:crypto";
1
2
  import type {
2
3
  Api,
3
4
  AssistantMessage,
@@ -45,10 +46,15 @@ export type SideThreadTurn =
45
46
  export interface SideThread {
46
47
  conversationContext: string;
47
48
  turns: SideThreadTurn[];
49
+ /**
50
+ * Provider routing ID (`options.sessionId`) shared by this thread's turns.
51
+ * Kept separate from the main Pi session so side requests never share its cache or affinity lane.
52
+ */
53
+ routingSessionId: string;
48
54
  }
49
55
 
50
56
  export function createSideThread(conversationContext: string): SideThread {
51
- return { conversationContext, turns: [] };
57
+ return { conversationContext, turns: [], routingSessionId: randomUUID() };
52
58
  }
53
59
 
54
60
  export function buildSideThreadMessages(thread: SideThread, question: string): Message[] {
@@ -104,7 +110,7 @@ export async function completeSideThreadTurn({
104
110
  { systemPrompt: SYSTEM_PROMPT, messages: buildSideThreadMessages(thread, question) },
105
111
  buildStreamOptions(
106
112
  auth,
107
- { thinkingLevel, signal, model, sessionId },
113
+ { thinkingLevel, signal, model, sessionId, routingSessionId: thread.routingSessionId },
108
114
  completeSimple.appliesRequestHeaderTransforms === true,
109
115
  ),
110
116
  );
@@ -157,7 +163,7 @@ export async function completeSideQuestion({
157
163
  },
158
164
  buildStreamOptions(
159
165
  auth,
160
- { thinkingLevel, signal, model, sessionId },
166
+ { thinkingLevel, signal, model, sessionId, routingSessionId: randomUUID() },
161
167
  completeSimple.appliesRequestHeaderTransforms === true,
162
168
  ),
163
169
  );
@@ -234,12 +240,15 @@ interface BuildSideThreadStreamOptions {
234
240
  thinkingLevel: BtwThinkingLevel;
235
241
  signal?: AbortSignal;
236
242
  model?: Pick<Model<Api>, "provider">;
243
+ /** Main Pi session ID, used only for OpenCode attribution headers. */
237
244
  sessionId?: string;
245
+ /** Side-request routing ID sent as `options.sessionId`; never the main session ID. */
246
+ routingSessionId: string;
238
247
  }
239
248
 
240
249
  function buildStreamOptions(
241
250
  auth: SideQuestionAuth | undefined,
242
- { thinkingLevel, signal, model, sessionId }: BuildSideThreadStreamOptions,
251
+ { thinkingLevel, signal, model, sessionId, routingSessionId }: BuildSideThreadStreamOptions,
243
252
  applyRequestHeaderTransforms: boolean,
244
253
  ): ModelsSimpleStreamOptions {
245
254
  const sessionHeaders = model ? getOpencodeSessionHeaders(model, sessionId) : undefined;
@@ -248,6 +257,9 @@ function buildStreamOptions(
248
257
  headers: applyRequestHeaderTransforms ? auth?.headers : mergeSessionHeaders(auth?.headers, sessionHeaders),
249
258
  env: auth?.env,
250
259
  signal,
260
+ // Pi documents sessionId as optional, but providers use it for request routing and
261
+ // some provider overrides require it. Pi core also mints a fresh ID for one-off requests.
262
+ sessionId: routingSessionId,
251
263
  };
252
264
  if (applyRequestHeaderTransforms && sessionHeaders) {
253
265
  options.transformHeaders = (headers) => mergeSessionHeaders(headers, sessionHeaders) ?? {};