@pstdio/sdk 0.36.1 → 0.37.0

package/README.md

@@ -15,12 +15,14 @@ bun add @pstdio/sdk
 | `@pstdio/sdk/resources` | Product resource types |
 | `@pstdio/sdk/prompts` | Prompt rendering |
 | `@pstdio/sdk/hooks` | Hook API contracts |
+| `@pstdio/sdk/data` | Draft layout, frontmatter, and ID/name resolution helpers |
+| `@pstdio/sdk/testing` | Command contexts and in-memory adapters for extension tests |
 
 Native extension entries work without React. The React entry requires its declared React and TanStack Query peers. Public declarations include their private contract dependencies and support `skipLibCheck: false` outside the repository.
 
 ## Build an extension
 
-Start with the [workbench cookbook](https://github.com/pufflyai/prompt-studio/blob/main/.pstdio/docs/extensions/cookbook.md) and [Extension Lab](https://github.com/pufflyai/prompt-studio/blob/main/extensions/extension-lab/README.md). Existing examples cover saved edits, inspectors, shared panels, custom modes, provider refs, and webview cleanup.
+Start with the [workbench cookbook](https://github.com/pufflyai/prompt-studio/blob/main/documentation/guides/extensions/0002-workbench-cookbook.md) and [Extension Lab](https://github.com/pufflyai/prompt-studio/blob/main/extensions/extension-lab/README.md). Existing examples cover saved edits, inspectors, shared panels, custom modes, provider refs, and webview cleanup.
 
 Keep package identity in `package.json`. Export `defineExtension(...)` from the manifest's `main`. Install through `pst extensions dev <path>` from a linked project. The same workflow watches native TypeScript, contribution declarations, and webview assets.
 
@@ -94,7 +96,7 @@ Host authors should use the [workbench guide](https://github.com/pufflyai/prompt
 
 ## Workspace contracts
 
-The alpha.13 host opens one folder per project and uses workspace APIs for execution and files.
+The host opens one folder per project and uses workspace APIs for execution and files.
 Use `ctx.projectFiles` for the project's default workspace and `ctx.workspaceFiles`
 for the invocation's working files. Project file operations check the current workspace
 readiness and file capabilities. Remote workspaces never fall back to local files.
@@ -114,8 +116,8 @@ Directory creation accepts one child name under an existing parent.
 Webviews can set `workspaceId` in `createWebviewClient(host, { workspaceId })`
 to run commands in that workspace. The host validates project ownership.
 
-Extensions that work with both host contracts can declare the exact versions
-`1.0.0-alpha.12 || 1.0.0-alpha.13` in `engines.pstdio`.
+The current host API version is `1.0.0-alpha.14`. Extensions that also work with the
+previous contract can declare `1.0.0-alpha.13 || 1.0.0-alpha.14` in `engines.pstdio`.
 General version ranges and wildcards remain unsupported.
 The compatible extension release must precede the host cutover.
-See [the staged release ADR](../../.pstdio/docs/adrs/0030-temporary-workspace-contract-release-bridge.md).
+See [the staged release ADR](../../documentation/adrs/0030-temporary-workspace-contract-release-bridge.md).

package/dist/api/index.js

@@ -3087,6 +3087,9 @@ function handlePipeResult(left, next, ctx) {
   }
   return next._zod.run({ value: left.value, issues: left.issues }, ctx);
 }
+var $ZodPreprocess = /* @__PURE__ */ $constructor("$ZodPreprocess", (inst, def) => {
+  $ZodPipe.init(inst, def);
+});
 var $ZodReadonly = /* @__PURE__ */ $constructor("$ZodReadonly", (inst, def) => {
   $ZodType.init(inst, def);
   defineLazyInternal(inst, "propValues", (zod) => zod.def.innerType._zod.propValues);
@@ -6122,6 +6125,10 @@ function pipe(in_, out) {
     out
   });
 }
+var ZodPreprocess = /* @__PURE__ */ $constructor("ZodPreprocess", (inst, def) => {
+  ZodPipe.init(inst, def);
+  $ZodPreprocess.init(inst, def);
+});
 var ZodReadonly = /* @__PURE__ */ $constructor("ZodReadonly", (inst, def) => {
   $ZodReadonly.init(inst, def);
   ZodType.init(inst, def);
@@ -6157,12 +6164,41 @@ function refine(fn, _params = {}) {
 function superRefine(fn, params) {
   return _superRefine(fn, params);
 }
+function _instanceof(cls, params = {}) {
+  const inst = new ZodCustom({
+    type: "custom",
+    check: "custom",
+    fn: (data) => data instanceof cls,
+    abort: true,
+    ...normalizeParams(params)
+  });
+  inst._zod.bag.Class = cls;
+  inst._zod.check = (payload) => {
+    if (!(payload.value instanceof cls)) {
+      payload.issues.push({
+        code: "invalid_type",
+        expected: cls.name,
+        input: payload.value,
+        inst,
+        path: [...inst._zod.def.path ?? []]
+      });
+    }
+  };
+  return inst;
+}
 function json(params) {
   const jsonSchema = lazy(() => {
     return union([string2(params), number2(), boolean2(), _null3(), array(jsonSchema), record(string2(), jsonSchema)]);
   });
   return jsonSchema;
 }
+function preprocess(fn, schema) {
+  return new ZodPreprocess({
+    type: "pipe",
+    in: transform(fn),
+    out: schema
+  });
+}
 // ../../node_modules/.bun/zod@4.5.4/node_modules/zod/v4/classic/coerce.js
 var exports_coerce = {};
 __export(exports_coerce, {
@@ -7314,7 +7350,8 @@ var workbenchExtensionNavigationTreeRecordSchema = object({
   extensionId: string2(),
   owner: union([modeRefSchema2, pageRefSchema2]),
   slot: _enum(["header", "content", "footer"]),
-  view: viewRefSchema2
+  view: viewRefSchema2,
+  resourceScope: _enum(["project", "selection"]).optional()
 });
 var workbenchExtensionResourceKindRecordSchema = object({
   id: string2(),
@@ -7541,10 +7578,6 @@ var setProjectExtensionEnabledRequestSchema = object({
 var setExtensionAutomationEnabledRequestSchema = object({
   enabled: boolean2()
 });
-var attemptExtensionFixResponseSchema = object({
-  sessionId: string2(),
-  title: string2()
-});
 var upgradeProjectExtensionResponseSchema = object({
   changed: boolean2(),
   extension: projectExtensionInstanceSchema
@@ -7552,6 +7585,13 @@ var upgradeProjectExtensionResponseSchema = object({
 var installMarketplaceExtensionResponseSchema = object({
   extension: projectExtensionInstanceSchema
 });
+var addLocalExtensionFolderRequestSchema = object({
+  name: string2().min(1),
+  files: preprocess((value) => Array.isArray(value) ? value : [value], array(_instanceof(File).meta({ type: "string", format: "binary" })).min(1))
+});
+var addLocalExtensionFolderResponseSchema = object({
+  extension: projectExtensionInstanceSchema
+});
 var setupProjectExtensionResponseSchema = object({
   extensionId: string2(),
   name: string2(),
@@ -7876,10 +7916,11 @@ var packageAsset = (path, baseUrl) => ({
   baseUrl
 });
 // ../pstdio-api-contracts/src/extension-kernel/types/extension.ts
-var EXTENSION_API_VERSION = "1.0.0-alpha.13";
+var EXTENSION_API_VERSION = "1.0.0-alpha.14";
 // ../pstdio-api-contracts/src/extension-kernel/types/webview-capabilities.ts
 var WEBVIEW_HOST_CAPABILITY_VERSION = 1;
 var WEBVIEW_DECLARABLE_CAPABILITIES = [
+  "clipboard.write",
   "commands.execute",
   "navigation.open",
   "placement.close",
@@ -7901,7 +7942,7 @@ var WEBVIEW_DECLARABLE_CAPABILITIES = [
 var WEBVIEW_SCOPED_DECLARABLE_CAPABILITIES = ["artifacts.read"];
 var ALWAYS_AVAILABLE_WEBVIEW_CAPABILITIES = ["host.dispatchKeyboardEvent"];
 var WEBVIEW_HOST_CAPABILITIES = [
-  ...WEBVIEW_DECLARABLE_CAPABILITIES,
+  ...WEBVIEW_DECLARABLE_CAPABILITIES.filter((capability) => capability !== "clipboard.write"),
   ...WEBVIEW_SCOPED_DECLARABLE_CAPABILITIES,
   ...ALWAYS_AVAILABLE_WEBVIEW_CAPABILITIES
 ];
@@ -7969,17 +8010,7 @@ var historyTurnEvidence = (known, native, prompt, body) => {
   return (turn) => keys.get(turn);
 };
 
-// ../pstdio-api-contracts/src/history-reconciliation.ts
-class HistoryConflict extends Error {
-}
-var submittedPrompt = (message) => message.parts.filter((part) => part.type === "text").map((part) => part.text).join(`
-`).replace(/\n\n<session-attachments>[\s\S]*<\/session-attachments>\s*$/, "").trim();
-var historyValueKey = (value) => JSON.stringify(value, (_key, item) => {
-  if (!item || typeof item !== "object" || Array.isArray(item))
-    return item;
-  return Object.fromEntries(Object.entries(item).sort(([a], [b]) => a.localeCompare(b)));
-});
-var historyMessageKey = (message) => historyValueKey([message.role, message.parts]);
+// ../pstdio-api-contracts/src/ordered-history-merge.ts
 var positions = (items, key) => {
   const result = new Map;
   items.forEach((item, index) => {
@@ -7990,24 +8021,53 @@ var positions = (items, key) => {
   });
   return result;
 };
-var mergeOrderedHistory = (known, native, key, merge, refineKey) => {
+var orderedAnchors = (anchors) => {
+  const tails = [];
+  const previous = [];
+  anchors.forEach(([, native], index) => {
+    let low = 0;
+    let high = tails.length;
+    while (low < high) {
+      const middle = low + high >> 1;
+      if (anchors[tails[middle]][1] < native)
+        low = middle + 1;
+      else
+        high = middle;
+    }
+    previous[index] = low > 0 ? tails[low - 1] : -1;
+    tails[low] = index;
+  });
+  const kept = [];
+  for (let index = tails.at(-1) ?? -1;index >= 0; index = previous[index])
+    kept.unshift(anchors[index]);
+  return kept;
+};
+var newerThanSaved = (known, native, options) => {
+  const times = options.time ? known.map(options.time).filter((value) => value !== undefined) : [];
+  if (!times.length)
+    return [];
+  const savedUntil = Math.max(...times);
+  return native.filter((item) => (options.time?.(item) ?? savedUntil) > savedUntil);
+};
+var mergeOrderedHistory = (known, native, options, trailing = true) => {
+  const { key, merge, refineKey, covered } = options;
+  const missing = native.filter((item) => !covered?.(item));
   if (!known.length)
-    return native;
+    return missing;
   if (!native.length)
     return known;
   const knownPositions = positions(known, key);
   const nativePositions = positions(native, key);
-  const anchors = [];
+  const found = [];
   for (const [value, indices] of knownPositions) {
     const other = nativePositions.get(value);
     if (indices.length === 1 && other?.length === 1)
-      anchors.push([indices[0], other[0]]);
+      found.push([indices[0], other[0]]);
   }
+  const anchors = orderedAnchors(found.sort((a, b) => a[0] - b[0]));
   if (!anchors.length) {
-    if (refineKey) {
-      const refined = mergeOrderedHistory(known, native, refineKey(known, native), merge);
-      return refined;
-    }
+    if (refineKey)
+      return mergeOrderedHistory(known, native, { ...options, key: refineKey(known, native), refineKey: undefined }, trailing);
     const paired = Math.min(known.length, native.length);
     if (known.slice(0, paired).every((item, index) => key(item) === key(native[index]))) {
       return [
@@ -8016,22 +8076,35 @@ var mergeOrderedHistory = (known, native, key, merge, refineKey) => {
         ...native.slice(paired)
       ];
     }
-    throw new HistoryConflict("ambiguous_interval");
+    return trailing ? [...known, ...newerThanSaved(known, missing, options)] : known;
   }
+  const kept = new Set(anchors.map(([, index]) => index));
+  const reordered = new Set(found.filter(([, index]) => !kept.has(index)).map(([, index]) => native[index]));
+  const nativeSpan = (start, end) => native.slice(start, end).filter((item) => !reordered.has(item));
   let left = 0;
   let right = 0;
   const result = [];
   for (const [a, b] of anchors) {
-    if (b < right)
-      throw new HistoryConflict("conflicting_order");
-    result.push(...mergeOrderedHistory(known.slice(left, a), native.slice(right, b), key, merge, refineKey));
+    result.push(...mergeOrderedHistory(known.slice(left, a), nativeSpan(right, b), options, false));
     result.push(merge(known[a], native[b]));
     left = a + 1;
     right = b + 1;
   }
-  result.push(...mergeOrderedHistory(known.slice(left), native.slice(right), key, merge, refineKey));
+  result.push(...mergeOrderedHistory(known.slice(left), nativeSpan(right), options, trailing));
   return result;
 };
+
+// ../pstdio-api-contracts/src/history-reconciliation.ts
+class HistoryConflict extends Error {
+}
+var submittedPrompt = (message) => message.parts.filter((part) => part.type === "text").map((part) => part.text).join(`
+`).replace(/\n\n<session-attachments>[\s\S]*<\/session-attachments>\s*$/, "").trim();
+var historyValueKey = (value) => JSON.stringify(value, (_key, item) => {
+  if (!item || typeof item !== "object" || Array.isArray(item))
+    return item;
+  return Object.fromEntries(Object.entries(item).sort(([a], [b]) => a.localeCompare(b)));
+});
+var historyMessageKey = (message) => historyValueKey([message.role, message.parts]);
 var splitHistoryTurns = (messages) => {
   const turns = [];
   for (const message of messages) {
@@ -8069,7 +8142,14 @@ var reconcileMessageHistory = (input, projection = {}) => {
   const mergeTurn = (known, native) => {
     const startsWithUser = known[0]?.role === "user" && native[0]?.role === "user";
     const body = (turn) => combineTextRuns(turn.slice(startsWithUser ? 1 : 0).filter((message) => !generated(message)));
-    const messages = mergeOrderedHistory(body(known), body(native), key, merge);
+    const shown = known.flatMap((message) => message.parts.flatMap((part) => part.type === "text" ? [part.text] : []));
+    const saved = shown.join("");
+    const messages = mergeOrderedHistory(body(known), body(native), {
+      key,
+      merge,
+      time: (message) => message.createdAt,
+      covered: (message) => message.parts.length > 0 && message.parts.every((part) => part.type === "text" && saved.includes(part.text))
+    });
     const metadata = [...native.filter(generated)];
     const counts = new Map;
     metadata.forEach((message) => {
@@ -8087,7 +8167,12 @@ var reconcileMessageHistory = (input, projection = {}) => {
   };
   try {
     const prompt = (turn) => turn[0]?.role === "user" ? `user:${submittedPrompt(turn[0])}` : "prefix";
-    const turns = mergeOrderedHistory(splitHistoryTurns(input.knownMessages), splitHistoryTurns(input.nativeMessages), prompt, mergeTurn, (known, native) => historyTurnEvidence(known, native, prompt, (turn) => combineTextRuns(turn.slice(1).filter((message) => !generated(message))).map(key)));
+    const turns = mergeOrderedHistory(splitHistoryTurns(input.knownMessages), splitHistoryTurns(input.nativeMessages), {
+      key: prompt,
+      merge: mergeTurn,
+      refineKey: (known, native) => historyTurnEvidence(known, native, prompt, (turn) => combineTextRuns(turn.slice(1).filter((message) => !generated(message))).map(key)),
+      time: (turn) => turn[0]?.createdAt
+    });
     const messages = turns.flat().map((message, index) => message.index === undefined ? message : { ...message, index });
     return { kind: "recovered", messages };
   } catch (error) {
@@ -8352,10 +8437,6 @@ var followUpDecisionSchema = union([
 var followUpResponseSchema = sessionSchema.extend({
   follow_up: followUpDecisionSchema
 });
-var sessionHistoryIssueSchema = object({
-  code: _enum(["reconciliation_conflict", "checkpoint_unreadable", "native_unavailable"]),
-  category: string2()
-});
 var sessionQueuedMessagesResponseSchema = object({ messages: array(sessionMessageSchema) });
 var sessionConversationSourcesSchema = object({
   checkpoint: array(sessionMessageSchema).nullable(),
@@ -8364,7 +8445,6 @@ var sessionConversationSourcesSchema = object({
   nativeError: string2().nullable()
 });
 var sessionConversationResponseSchema = object({
-  historyIssue: sessionHistoryIssueSchema.optional(),
   session: sessionSchema,
   messages: array(sessionMessageSchema)
 });

package/dist/api.d.ts

@@ -1,6 +1,6 @@
-import { $ as WorkbenchExtensionMetadata, $a as FollowUpInput, At as TerminalHostEvent, B as ConfigureExtensionConnectionInput, C as ExtensionSettingsPanelRecord, Co as UpdateNotificationInput, D as ExtensionCommandPaletteResourceRecord, E as ExtensionKeybindingRecord, F as ProjectExtensionInstance, G as LocalizableString, H as ListExtensionConnectionsResponse, I as UpgradeProjectExtensionResponse, J as ExtensionMenuContribution, K as ExtensionCommandPaletteContribution, L as CommandExecuteRequest, M as InstallMarketplaceExtensionResponse, Mt as TerminalSessionRequest, N as ListProjectExtensionsResponse, Nt as TerminalSessionResult, O as WorkbenchExtensionCommandPaletteResourceRecord, P as MarketplaceExtension, Q as WorkbenchExtensionHarnessRecord, Qa as CreateSessionInput, R as CommandExecuteResponse, S as ExtensionSettingValueRecord, So as NotificationStatus, T as UpdateExtensionSettingRequest, U as ExtensionDiagnostic, V as ExtensionConnectionRecord, W as ExtensionRecord, X as ListExtensionAppearanceResponse, Xa as UpdateSkillInput, Xu as ResourceRef, Y as WorkbenchExtensionAutomationRecord, Z as ListExtensionCommandsResponse, Za as ApprovalInput, _ as CreateProjectInput, _o as NotificationAction, a as RemoveWorktreeResponse$1, at as AutomationRunStatus, bo as NotificationOrigin, c as WorkspaceFileContent$1, co as SessionConversationResponse, ct as IssueAutomationTokenInput, do as SessionQueuedMessagesResponse, dt as ListAutomationTokensResponse, et as WorkbenchExtensionViewBody, f as WorkspaceProviderDescriptor, g as sessionAttachmentMimeTypesByExtension, go as Notification, h as UpdateSettingsInput, ho as ListNotificationsResponse, i as ListWorkspaceFilesInput$1, io as ResolveSessionIdResponse, it as AutomationRunEvent, jt as TerminalSessionOperation, k as AttemptExtensionFixResponse, l as WorkspaceFileEntry$1, lo as SessionConversationSources, lt as IssueAutomationTokenResponse, m as Settings, mo as ListNotificationsQuery, nt as AutomationRun, o as RenameWorkspaceInput$1, oo as SessionAttachment, ot as AutomationTokenRecord, p as WriteWorkspaceFileInput$1, po as CreateNotificationInput, q as ExtensionCommandRecord, ro as ResolveSessionIdInput, rt as AutomationRunError, so as SessionAttachmentRef, st as CreateAutomationRunInput, t as CreateWorkspaceInput$1, tt as WorkbenchExtensionViewRecord, u as WorkspaceFilesResponse$1, uo as SessionHistoryIssue, ut as ListAutomationRunEventsResponse, vo as NotificationActorType, w as ListExtensionSettingsResponse, x as ExtensionSettingDefinitionRecord, xo as NotificationPriority, y as UpdateProjectInput, yo as NotificationKind } from "./index-CJUDgZmO.js";
-import "./sessions-CPa_dPkI.js";
-import "./skills-CPa_dPkI.js";
+import { $ as WorkbenchExtensionMetadata, $a as FollowUpInput, At as TerminalHostEvent, B as ConfigureExtensionConnectionInput, C as ExtensionSettingsPanelRecord, D as ExtensionCommandPaletteResourceRecord, E as ExtensionKeybindingRecord, F as ProjectExtensionInstance, G as LocalizableString, H as ListExtensionConnectionsResponse, I as UpgradeProjectExtensionResponse, J as ExtensionMenuContribution, K as ExtensionCommandPaletteContribution, L as CommandExecuteRequest, M as InstallMarketplaceExtensionResponse, Mt as TerminalSessionRequest, N as ListProjectExtensionsResponse, Nt as TerminalSessionResult, O as WorkbenchExtensionCommandPaletteResourceRecord, P as MarketplaceExtension, Q as WorkbenchExtensionHarnessRecord, Qa as CreateSessionInput, R as CommandExecuteResponse, S as ExtensionSettingValueRecord, So as UpdateNotificationInput, T as UpdateExtensionSettingRequest, U as ExtensionDiagnostic, V as ExtensionConnectionRecord, W as ExtensionRecord, X as ListExtensionAppearanceResponse, Xa as UpdateSkillInput, Y as WorkbenchExtensionAutomationRecord, Yu as ResourceRef, Z as ListExtensionCommandsResponse, Za as ApprovalInput, _ as CreateProjectInput, _o as NotificationActorType, a as RemoveWorktreeResponse$1, at as AutomationRunStatus, bo as NotificationPriority, c as WorkspaceFileContent$1, co as SessionConversationResponse, ct as IssueAutomationTokenInput, dt as ListAutomationTokensResponse, et as WorkbenchExtensionViewBody, f as WorkspaceProviderDescriptor, fo as CreateNotificationInput, g as sessionAttachmentMimeTypesByExtension, go as NotificationAction, h as UpdateSettingsInput, ho as Notification, i as ListWorkspaceFilesInput$1, io as ResolveSessionIdResponse, it as AutomationRunEvent, jt as TerminalSessionOperation, k as AddLocalExtensionFolderResponse, l as WorkspaceFileEntry$1, lo as SessionConversationSources, lt as IssueAutomationTokenResponse, m as Settings, mo as ListNotificationsResponse, nt as AutomationRun, o as RenameWorkspaceInput$1, oo as SessionAttachment, ot as AutomationTokenRecord, p as WriteWorkspaceFileInput$1, po as ListNotificationsQuery, q as ExtensionCommandRecord, ro as ResolveSessionIdInput, rt as AutomationRunError, so as SessionAttachmentRef, st as CreateAutomationRunInput, t as CreateWorkspaceInput$1, tt as WorkbenchExtensionViewRecord, u as WorkspaceFilesResponse$1, uo as SessionQueuedMessagesResponse, ut as ListAutomationRunEventsResponse, vo as NotificationKind, w as ListExtensionSettingsResponse, x as ExtensionSettingDefinitionRecord, xo as NotificationStatus, y as UpdateProjectInput, yo as NotificationOrigin } from "./index-CnOTGr_I.js";
+import "./sessions-CkEvTavd.js";
+import "./skills-CkEvTavd.js";
 //#region src/api/workspaces.d.ts
 type CreateWorkspaceInput = CreateWorkspaceInput$1;
 type RemoveWorktreeResponse = RemoveWorktreeResponse$1;
@@ -11,5 +11,5 @@ type WorkspaceFileEntry = WorkspaceFileEntry$1;
 type WorkspaceFilesResponse = WorkspaceFilesResponse$1;
 type WriteWorkspaceFileInput = WriteWorkspaceFileInput$1;
 //#endregion
-export { type ApprovalInput, type AttemptExtensionFixResponse, type AutomationRun, type AutomationRunError, type AutomationRunEvent, type AutomationRunStatus, type AutomationTokenRecord, type CommandExecuteRequest, type CommandExecuteResponse, type ConfigureExtensionConnectionInput, type CreateAutomationRunInput, type CreateNotificationInput, type CreateProjectInput, type CreateSessionInput, type CreateWorkspaceInput, type ExtensionCommandPaletteContribution, type ExtensionCommandPaletteResourceRecord, type ExtensionCommandRecord, type ExtensionConnectionRecord, type ExtensionDiagnostic, type ExtensionKeybindingRecord, type ExtensionMenuContribution, type ExtensionRecord, type ExtensionSettingDefinitionRecord, type ExtensionSettingValueRecord, type ExtensionSettingsPanelRecord, type FollowUpInput, type InstallMarketplaceExtensionResponse, type IssueAutomationTokenInput, type IssueAutomationTokenResponse, type ListAutomationRunEventsResponse, type ListAutomationTokensResponse, type ListExtensionAppearanceResponse, type ListExtensionCommandsResponse, type ListExtensionConnectionsResponse, type ListExtensionSettingsResponse, type ListNotificationsQuery, type ListNotificationsResponse, type ListProjectExtensionsResponse, type ListWorkspaceFilesInput, type LocalizableString, type MarketplaceExtension, type Notification, type NotificationAction, type NotificationActorType, type NotificationKind, type NotificationOrigin, type NotificationPriority, type NotificationStatus, type ProjectExtensionInstance, type RemoveWorktreeResponse, type RenameWorkspaceInput, type ResolveSessionIdInput, type ResolveSessionIdResponse, type ResourceRef, type SessionAttachment, type SessionAttachmentRef, type SessionConversationResponse, type SessionConversationSources, type SessionHistoryIssue, type SessionQueuedMessagesResponse, type Settings, type TerminalHostEvent, type TerminalSessionOperation, type TerminalSessionRequest, type TerminalSessionResult, type UpdateExtensionSettingRequest, type UpdateNotificationInput, type UpdateProjectInput, type UpdateSettingsInput, type UpdateSkillInput, type UpgradeProjectExtensionResponse, type WorkbenchExtensionAutomationRecord, type WorkbenchExtensionCommandPaletteResourceRecord, type WorkbenchExtensionHarnessRecord, type WorkbenchExtensionMetadata, type WorkbenchExtensionViewBody, type WorkbenchExtensionViewRecord, type WorkspaceFileContent, type WorkspaceFileEntry, type WorkspaceFilesResponse, type WorkspaceProviderDescriptor, type WriteWorkspaceFileInput, sessionAttachmentMimeTypesByExtension };
+export { type AddLocalExtensionFolderResponse, type ApprovalInput, type AutomationRun, type AutomationRunError, type AutomationRunEvent, type AutomationRunStatus, type AutomationTokenRecord, type CommandExecuteRequest, type CommandExecuteResponse, type ConfigureExtensionConnectionInput, type CreateAutomationRunInput, type CreateNotificationInput, type CreateProjectInput, type CreateSessionInput, type CreateWorkspaceInput, type ExtensionCommandPaletteContribution, type ExtensionCommandPaletteResourceRecord, type ExtensionCommandRecord, type ExtensionConnectionRecord, type ExtensionDiagnostic, type ExtensionKeybindingRecord, type ExtensionMenuContribution, type ExtensionRecord, type ExtensionSettingDefinitionRecord, type ExtensionSettingValueRecord, type ExtensionSettingsPanelRecord, type FollowUpInput, type InstallMarketplaceExtensionResponse, type IssueAutomationTokenInput, type IssueAutomationTokenResponse, type ListAutomationRunEventsResponse, type ListAutomationTokensResponse, type ListExtensionAppearanceResponse, type ListExtensionCommandsResponse, type ListExtensionConnectionsResponse, type ListExtensionSettingsResponse, type ListNotificationsQuery, type ListNotificationsResponse, type ListProjectExtensionsResponse, type ListWorkspaceFilesInput, type LocalizableString, type MarketplaceExtension, type Notification, type NotificationAction, type NotificationActorType, type NotificationKind, type NotificationOrigin, type NotificationPriority, type NotificationStatus, type ProjectExtensionInstance, type RemoveWorktreeResponse, type RenameWorkspaceInput, type ResolveSessionIdInput, type ResolveSessionIdResponse, type ResourceRef, type SessionAttachment, type SessionAttachmentRef, type SessionConversationResponse, type SessionConversationSources, type SessionQueuedMessagesResponse, type Settings, type TerminalHostEvent, type TerminalSessionOperation, type TerminalSessionRequest, type TerminalSessionResult, type UpdateExtensionSettingRequest, type UpdateNotificationInput, type UpdateProjectInput, type UpdateSettingsInput, type UpdateSkillInput, type UpgradeProjectExtensionResponse, type WorkbenchExtensionAutomationRecord, type WorkbenchExtensionCommandPaletteResourceRecord, type WorkbenchExtensionHarnessRecord, type WorkbenchExtensionMetadata, type WorkbenchExtensionViewBody, type WorkbenchExtensionViewRecord, type WorkspaceFileContent, type WorkspaceFileEntry, type WorkspaceFilesResponse, type WorkspaceProviderDescriptor, type WriteWorkspaceFileInput, sessionAttachmentMimeTypesByExtension };
 export {};

package/dist/client/index.js

@@ -181,9 +181,9 @@ var createRequestHeaders = (options, reqOpts = {}) => {
     headers.set("authorization", `Bearer ${token}`);
   return headers;
 };
-var isBinaryBody = (body) => body instanceof ArrayBuffer || ArrayBuffer.isView(body);
+var isRawBody = (body) => body instanceof ArrayBuffer || ArrayBuffer.isView(body) || body instanceof FormData;
 var serializeRequestBody = (body) => {
-  if (body instanceof ArrayBuffer)
+  if (body instanceof ArrayBuffer || body instanceof FormData)
     return body;
   if (ArrayBuffer.isView(body)) {
     if (body.buffer instanceof ArrayBuffer)
@@ -201,7 +201,7 @@ var createRequest = (options) => {
     const url = resolveClientUrl(baseUrl, path);
     const headers = createRequestHeaders(options, {
       headers: reqOpts.headers,
-      hasJsonBody: reqOpts.body !== undefined && !isBinaryBody(reqOpts.body)
+      hasJsonBody: reqOpts.body !== undefined && !isRawBody(reqOpts.body)
     });
     if (!isSameOriginTarget(baseUrl, path, url))
       headers.delete("authorization");
@@ -325,10 +325,6 @@ var dispatchSessionStreamEvent = (event, handlers) => {
     handlers.onApprovalRequest?.(parseEventData(event.data));
     return;
   }
-  if (event.event === "history_issue") {
-    handlers.onHistoryIssue?.(parseEventData(event.data));
-    return;
-  }
   if (event.event === "queued_messages") {
     handlers.onQueuedMessages?.(parseEventData(event.data));
     return;

package/dist/client.d.ts

@@ -1,3 +1,3 @@
-import { A as RequestFn, C as DirectoryEntry, D as AgentClient, E as AutomationClient, M as createRequest, O as ClientOptions, S as NotificationsClient, T as ExtensionClient, _ as SessionStreamHandlers, a as SyncClient, b as createRuntimeClient, c as SyncWriter, d as parseSyncDeleteEvent, f as SkillClient, g as SessionStreamConnection, h as SessionClient, i as StartSyncInput, j as RequestOptions, k as PstdioApiError, l as SyncWriterProvider, m as ListSessionsInput, n as createClient, o as SyncConnection, p as SettingsClient, r as WorkspaceClient, s as SyncRow, t as PstdioClient, u as applySyncEvent, v as SseEvent, w as FilesystemClient, x as ProjectClient, y as RuntimeClient } from "./index-KZC6jRip.js";
+import { A as RequestFn, C as DirectoryEntry, D as AgentClient, E as AutomationClient, M as createRequest, O as ClientOptions, S as NotificationsClient, T as ExtensionClient, _ as SessionStreamHandlers, a as SyncClient, b as createRuntimeClient, c as SyncWriter, d as parseSyncDeleteEvent, f as SkillClient, g as SessionStreamConnection, h as SessionClient, i as StartSyncInput, j as RequestOptions, k as PstdioApiError, l as SyncWriterProvider, m as ListSessionsInput, n as createClient, o as SyncConnection, p as SettingsClient, r as WorkspaceClient, s as SyncRow, t as PstdioClient, u as applySyncEvent, v as SseEvent, w as FilesystemClient, x as ProjectClient, y as RuntimeClient } from "./index-DZSUI5-9.js";
 export { type AgentClient, type AutomationClient, type ClientOptions, type DirectoryEntry, type ExtensionClient, type FilesystemClient, type ListSessionsInput, type NotificationsClient, type ProjectClient, PstdioApiError, type PstdioClient, type RequestFn, type RequestOptions, type RuntimeClient, type SessionClient, type SessionStreamConnection, type SessionStreamHandlers, type SettingsClient, type SkillClient, type SseEvent, type StartSyncInput, type SyncClient, type SyncConnection, type SyncRow, type SyncWriter, type SyncWriterProvider, type WorkspaceClient, applySyncEvent, createClient, createRequest, createRuntimeClient, parseSyncDeleteEvent };
 export {};

package/dist/data.d.ts

@@ -1,4 +1,4 @@
-import { Ir as ArtifactMount } from "./index-CJUDgZmO.js";
+import { Ir as ArtifactMount } from "./index-CnOTGr_I.js";
 //#region src/data/draft-layout.d.ts
 export declare const assertSafePathSegment: (value: string) => void;
 export declare const requireRepoFiles: (projectFiles: ArtifactMount | undefined) => ArtifactMount;

package/dist/extensions/index.js

@@ -271,10 +271,11 @@ var packageAsset = (path, baseUrl) => ({
   baseUrl
 });
 // ../pstdio-api-contracts/src/extension-kernel/types/extension.ts
-var EXTENSION_API_VERSION = "1.0.0-alpha.13";
+var EXTENSION_API_VERSION = "1.0.0-alpha.14";
 // ../pstdio-api-contracts/src/extension-kernel/types/webview-capabilities.ts
 var WEBVIEW_HOST_CAPABILITY_VERSION = 1;
 var WEBVIEW_DECLARABLE_CAPABILITIES = [
+  "clipboard.write",
   "commands.execute",
   "navigation.open",
   "placement.close",
@@ -296,7 +297,7 @@ var WEBVIEW_DECLARABLE_CAPABILITIES = [
 var WEBVIEW_SCOPED_DECLARABLE_CAPABILITIES = ["artifacts.read"];
 var ALWAYS_AVAILABLE_WEBVIEW_CAPABILITIES = ["host.dispatchKeyboardEvent"];
 var WEBVIEW_HOST_CAPABILITIES = [
-  ...WEBVIEW_DECLARABLE_CAPABILITIES,
+  ...WEBVIEW_DECLARABLE_CAPABILITIES.filter((capability) => capability !== "clipboard.write"),
   ...WEBVIEW_SCOPED_DECLARABLE_CAPABILITIES,
   ...ALWAYS_AVAILABLE_WEBVIEW_CAPABILITIES
 ];
@@ -351,17 +352,7 @@ var historyTurnEvidence = (known, native, prompt, body) => {
   return (turn) => keys.get(turn);
 };
 
-// ../pstdio-api-contracts/src/history-reconciliation.ts
-class HistoryConflict extends Error {
-}
-var submittedPrompt = (message) => message.parts.filter((part) => part.type === "text").map((part) => part.text).join(`
-`).replace(/\n\n<session-attachments>[\s\S]*<\/session-attachments>\s*$/, "").trim();
-var historyValueKey = (value) => JSON.stringify(value, (_key, item) => {
-  if (!item || typeof item !== "object" || Array.isArray(item))
-    return item;
-  return Object.fromEntries(Object.entries(item).sort(([a], [b]) => a.localeCompare(b)));
-});
-var historyMessageKey = (message) => historyValueKey([message.role, message.parts]);
+// ../pstdio-api-contracts/src/ordered-history-merge.ts
 var positions = (items, key) => {
   const result = new Map;
   items.forEach((item, index) => {
@@ -372,24 +363,53 @@ var positions = (items, key) => {
   });
   return result;
 };
-var mergeOrderedHistory = (known, native, key, merge, refineKey) => {
+var orderedAnchors = (anchors) => {
+  const tails = [];
+  const previous = [];
+  anchors.forEach(([, native], index) => {
+    let low = 0;
+    let high = tails.length;
+    while (low < high) {
+      const middle = low + high >> 1;
+      if (anchors[tails[middle]][1] < native)
+        low = middle + 1;
+      else
+        high = middle;
+    }
+    previous[index] = low > 0 ? tails[low - 1] : -1;
+    tails[low] = index;
+  });
+  const kept = [];
+  for (let index = tails.at(-1) ?? -1;index >= 0; index = previous[index])
+    kept.unshift(anchors[index]);
+  return kept;
+};
+var newerThanSaved = (known, native, options) => {
+  const times = options.time ? known.map(options.time).filter((value) => value !== undefined) : [];
+  if (!times.length)
+    return [];
+  const savedUntil = Math.max(...times);
+  return native.filter((item) => (options.time?.(item) ?? savedUntil) > savedUntil);
+};
+var mergeOrderedHistory = (known, native, options, trailing = true) => {
+  const { key, merge, refineKey, covered } = options;
+  const missing = native.filter((item) => !covered?.(item));
   if (!known.length)
-    return native;
+    return missing;
   if (!native.length)
     return known;
   const knownPositions = positions(known, key);
   const nativePositions = positions(native, key);
-  const anchors = [];
+  const found = [];
   for (const [value, indices] of knownPositions) {
     const other = nativePositions.get(value);
     if (indices.length === 1 && other?.length === 1)
-      anchors.push([indices[0], other[0]]);
+      found.push([indices[0], other[0]]);
   }
+  const anchors = orderedAnchors(found.sort((a, b) => a[0] - b[0]));
   if (!anchors.length) {
-    if (refineKey) {
-      const refined = mergeOrderedHistory(known, native, refineKey(known, native), merge);
-      return refined;
-    }
+    if (refineKey)
+      return mergeOrderedHistory(known, native, { ...options, key: refineKey(known, native), refineKey: undefined }, trailing);
     const paired = Math.min(known.length, native.length);
     if (known.slice(0, paired).every((item, index) => key(item) === key(native[index]))) {
       return [
@@ -398,22 +418,35 @@ var mergeOrderedHistory = (known, native, key, merge, refineKey) => {
         ...native.slice(paired)
       ];
     }
-    throw new HistoryConflict("ambiguous_interval");
+    return trailing ? [...known, ...newerThanSaved(known, missing, options)] : known;
   }
+  const kept = new Set(anchors.map(([, index]) => index));
+  const reordered = new Set(found.filter(([, index]) => !kept.has(index)).map(([, index]) => native[index]));
+  const nativeSpan = (start, end) => native.slice(start, end).filter((item) => !reordered.has(item));
   let left = 0;
   let right = 0;
   const result = [];
   for (const [a, b] of anchors) {
-    if (b < right)
-      throw new HistoryConflict("conflicting_order");
-    result.push(...mergeOrderedHistory(known.slice(left, a), native.slice(right, b), key, merge, refineKey));
+    result.push(...mergeOrderedHistory(known.slice(left, a), nativeSpan(right, b), options, false));
     result.push(merge(known[a], native[b]));
     left = a + 1;
     right = b + 1;
   }
-  result.push(...mergeOrderedHistory(known.slice(left), native.slice(right), key, merge, refineKey));
+  result.push(...mergeOrderedHistory(known.slice(left), nativeSpan(right), options, trailing));
   return result;
 };
+
+// ../pstdio-api-contracts/src/history-reconciliation.ts
+class HistoryConflict extends Error {
+}
+var submittedPrompt = (message) => message.parts.filter((part) => part.type === "text").map((part) => part.text).join(`
+`).replace(/\n\n<session-attachments>[\s\S]*<\/session-attachments>\s*$/, "").trim();
+var historyValueKey = (value) => JSON.stringify(value, (_key, item) => {
+  if (!item || typeof item !== "object" || Array.isArray(item))
+    return item;
+  return Object.fromEntries(Object.entries(item).sort(([a], [b]) => a.localeCompare(b)));
+});
+var historyMessageKey = (message) => historyValueKey([message.role, message.parts]);
 var splitHistoryTurns = (messages) => {
   const turns = [];
   for (const message of messages) {
@@ -451,7 +484,14 @@ var reconcileMessageHistory = (input, projection = {}) => {
   const mergeTurn = (known, native) => {
     const startsWithUser = known[0]?.role === "user" && native[0]?.role === "user";
     const body = (turn) => combineTextRuns(turn.slice(startsWithUser ? 1 : 0).filter((message) => !generated(message)));
-    const messages = mergeOrderedHistory(body(known), body(native), key, merge);
+    const shown = known.flatMap((message) => message.parts.flatMap((part) => part.type === "text" ? [part.text] : []));
+    const saved = shown.join("");
+    const messages = mergeOrderedHistory(body(known), body(native), {
+      key,
+      merge,
+      time: (message) => message.createdAt,
+      covered: (message) => message.parts.length > 0 && message.parts.every((part) => part.type === "text" && saved.includes(part.text))
+    });
     const metadata = [...native.filter(generated)];
     const counts = new Map;
     metadata.forEach((message) => {
@@ -469,7 +509,12 @@ var reconcileMessageHistory = (input, projection = {}) => {
   };
   try {
     const prompt = (turn) => turn[0]?.role === "user" ? `user:${submittedPrompt(turn[0])}` : "prefix";
-    const turns = mergeOrderedHistory(splitHistoryTurns(input.knownMessages), splitHistoryTurns(input.nativeMessages), prompt, mergeTurn, (known, native) => historyTurnEvidence(known, native, prompt, (turn) => combineTextRuns(turn.slice(1).filter((message) => !generated(message))).map(key)));
+    const turns = mergeOrderedHistory(splitHistoryTurns(input.knownMessages), splitHistoryTurns(input.nativeMessages), {
+      key: prompt,
+      merge: mergeTurn,
+      refineKey: (known, native) => historyTurnEvidence(known, native, prompt, (turn) => combineTextRuns(turn.slice(1).filter((message) => !generated(message))).map(key)),
+      time: (turn) => turn[0]?.createdAt
+    });
     const messages = turns.flat().map((message, index) => message.index === undefined ? message : { ...message, index });
     return { kind: "recovered", messages };
   } catch (error) {
@@ -479,7 +524,7 @@ var reconcileMessageHistory = (input, projection = {}) => {
   }
 };
 // package.json
-var version = "0.36.1";
+var version = "0.37.0";
 
 // src/version.ts
 var SDK_VERSION = version;