Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/mobile/src/screens/session-transcript.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,6 @@ const messages: SessionMessageInfo[] = [
{
id: "msg_compaction",
reason: "auto",
recent: "Recent context",
status: "completed",
summary: "Compaction summary",
time: { created: 10 },
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/src/screens/session-transcript.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ export const SessionTranscriptRow = memo(function SessionTranscriptRow({
<Disclosure
label={`Compaction / ${sentenceCase(message.status)}`}
largeText={largeText}
text={[message.summary, message.recent]}
text={message.summary}
/>
);
default:
Expand Down
17 changes: 7 additions & 10 deletions apps/mobile/src/state/transcript-event-reducer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ test("projects a complete assistant step and repairs volatile deltas with termin
assistantMessageID: "msg_assistant",
ordinal: 0,
sessionID: "session-1",
state: { phase: "thinking" },
native: { phase: "thinking" },
}),
transcriptEvent("session.reasoning.delta", {
assistantMessageID: "msg_assistant",
Expand All @@ -51,14 +51,14 @@ test("projects a complete assistant step and repairs volatile deltas with termin
assistantMessageID: "msg_assistant",
ordinal: 0,
sessionID: "session-1",
state: { response: true },
native: { response: true },
text: "authoritative text",
}),
transcriptEvent("session.reasoning.ended", {
assistantMessageID: "msg_assistant",
ordinal: 0,
sessionID: "session-1",
state: { phase: "done" },
native: { phase: "done" },
text: "authoritative reasoning",
}),
transcriptEvent("session.tool.input.started", {
Expand All @@ -85,7 +85,7 @@ test("projects a complete assistant step and repairs volatile deltas with termin
id: "tool-1",
input: { path: "file.ts" },
sessionID: "session-1",
state: { request: "accepted" },
native: { request: "accepted" },
}),
transcriptEvent("session.tool.progress", {
assistantMessageID: "msg_assistant",
Expand All @@ -99,15 +99,15 @@ test("projects a complete assistant step and repairs volatile deltas with termin
executed: true,
id: "tool-1",
metadata: { progress: 1 },
resultState: { complete: true },
native: { complete: true },
sessionID: "session-1",
}),
transcriptEvent("session.step.ended", {
assistantMessageID: "msg_assistant",
cost: 0.25,
files: ["changed.ts"],
finish: "stop",
providerState: { settled: true },
native: { settled: true },
rawFinish: "done",
sessionID: "session-1",
snapshot: "end-snapshot",
Expand All @@ -129,9 +129,8 @@ test("projects a complete assistant step and repairs volatile deltas with termin
type: "assistant",
});
expect(assistant?.type === "assistant" && assistant.content).toEqual([
{ state: { response: true }, text: "authoritative text", type: "text" },
{ text: "authoritative text", type: "text" },
{
state: { phase: "done" },
text: "authoritative reasoning",
time: { completed: 1, created: 1 },
type: "reasoning",
Expand All @@ -140,8 +139,6 @@ test("projects a complete assistant step and repairs volatile deltas with termin
executed: true,
id: "tool-1",
name: "read",
providerResultState: { complete: true },
providerState: { request: "accepted" },
state: {
content: [{ mime: "text/plain", type: "file", uri: "file:///redacted" }],
input: { path: "file.ts" },
Expand Down
53 changes: 8 additions & 45 deletions apps/mobile/src/state/transcript-event-reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export function isValidTranscriptReductionEvent(event: OpenCodeEvent) {
isFiniteNumber(data.cost) &&
isTokenUsage(data.tokens) &&
(data.rawFinish === undefined || isBoundedString(data.rawFinish)) &&
(data.providerState === undefined || isJsonRecord(data.providerState)) &&
(data.snapshot === undefined || isBoundedString(data.snapshot, 4096)) &&
isOptionalStringArray(data.files)
);
Expand All @@ -75,7 +74,6 @@ export function isValidTranscriptReductionEvent(event: OpenCodeEvent) {
isStructuredError(data.error) &&
(data.finish === undefined || data.finish === "content-filter") &&
(data.rawFinish === undefined || isBoundedString(data.rawFinish)) &&
(data.providerState === undefined || isJsonRecord(data.providerState)) &&
(data.cost === undefined || isFiniteNumber(data.cost)) &&
(data.tokens === undefined || isTokenUsage(data.tokens)) &&
(data.snapshot === undefined || isBoundedString(data.snapshot, 4096)) &&
Expand All @@ -86,8 +84,7 @@ export function isValidTranscriptReductionEvent(event: OpenCodeEvent) {
return (
isEventTime(event.created) &&
isMessageID(data.assistantMessageID) &&
isOrdinal(data.ordinal) &&
(data.state === undefined || isJsonRecord(data.state))
isOrdinal(data.ordinal)
);
case "session.text.delta":
case "session.reasoning.delta":
Expand All @@ -102,8 +99,7 @@ export function isValidTranscriptReductionEvent(event: OpenCodeEvent) {
isEventTime(event.created) &&
isMessageID(data.assistantMessageID) &&
isOrdinal(data.ordinal) &&
isBoundedString(data.text) &&
(data.state === undefined || isJsonRecord(data.state))
isBoundedString(data.text)
);
case "session.tool.input.started":
return (
Expand All @@ -126,8 +122,7 @@ export function isValidTranscriptReductionEvent(event: OpenCodeEvent) {
isMessageID(data.assistantMessageID) &&
isToolID(data.id) &&
isJsonRecord(data.input) &&
typeof data.executed === "boolean" &&
(data.state === undefined || isJsonRecord(data.state))
typeof data.executed === "boolean"
);
case "session.tool.progress":
return (
Expand All @@ -143,8 +138,7 @@ export function isValidTranscriptReductionEvent(event: OpenCodeEvent) {
data.content.length > 0 &&
data.content.length <= 256 &&
data.content.every(isToolContent) &&
(data.metadata === undefined || isJsonRecord(data.metadata)) &&
(data.resultState === undefined || isJsonRecord(data.resultState))
(data.metadata === undefined || isJsonRecord(data.metadata))
);
case "session.tool.failed":
return (
Expand All @@ -158,8 +152,7 @@ export function isValidTranscriptReductionEvent(event: OpenCodeEvent) {
data.content.length > 0 &&
data.content.length <= 256 &&
data.content.every(isToolContent))) &&
(data.metadata === undefined || isJsonRecord(data.metadata)) &&
(data.resultState === undefined || isJsonRecord(data.resultState))
(data.metadata === undefined || isJsonRecord(data.metadata))
);
case "session.retry.scheduled":
return (
Expand Down Expand Up @@ -230,33 +223,19 @@ function reduceTranscriptEvent(
);
case "session.text.ended":
return updateAssistantMessage(current, event.data.assistantMessageID, (message) =>
finishTextPart(
message,
event.data.ordinal,
"text",
event.created,
event.data.text,
event.data.state,
),
finishTextPart(message, event.data.ordinal, "text", event.created, event.data.text),
);
case "session.reasoning.started":
return updateAssistantMessage(current, event.data.assistantMessageID, (message) =>
startTextPart(message, event.data.ordinal, "reasoning", event.created, event.data.state),
startTextPart(message, event.data.ordinal, "reasoning", event.created),
);
case "session.reasoning.delta":
return updateAssistantMessage(current, event.data.assistantMessageID, (message) =>
appendPartDelta(message, event.data.ordinal, "reasoning", event.data.delta),
);
case "session.reasoning.ended":
return updateAssistantMessage(current, event.data.assistantMessageID, (message) =>
finishTextPart(
message,
event.data.ordinal,
"reasoning",
event.created,
event.data.text,
event.data.state,
),
finishTextPart(message, event.data.ordinal, "reasoning", event.created, event.data.text),
);
case "session.tool.input.started":
return updateAssistantMessage(current, event.data.assistantMessageID, (message) =>
Expand All @@ -278,7 +257,6 @@ function reduceTranscriptEvent(
event.data.input,
event.data.executed,
event.created,
event.data.state,
),
);
case "session.tool.progress":
Expand All @@ -294,7 +272,6 @@ function reduceTranscriptEvent(
event.data.metadata,
event.data.executed,
event.created,
event.data.resultState,
),
);
case "session.tool.failed":
Expand All @@ -307,7 +284,6 @@ function reduceTranscriptEvent(
event.data.metadata,
event.data.executed,
event.created,
event.data.resultState,
),
);
case "session.retry.scheduled":
Expand Down Expand Up @@ -370,7 +346,6 @@ function endAssistantStep(
...message,
cost: event.data.cost,
finish: event.data.finish,
...(event.data.providerState === undefined ? {} : { providerState: event.data.providerState }),
...(event.data.rawFinish === undefined ? {} : { rawFinish: event.data.rawFinish }),
...(snapshot === undefined ? {} : { snapshot }),
time: { ...message.time, completed: event.created },
Expand All @@ -389,7 +364,6 @@ function failAssistantStep(
error: event.data.error,
finish: event.data.finish ?? "error",
...(event.data.cost === undefined ? {} : { cost: event.data.cost }),
...(event.data.providerState === undefined ? {} : { providerState: event.data.providerState }),
...(event.data.rawFinish === undefined ? {} : { rawFinish: event.data.rawFinish }),
...(snapshot === undefined ? {} : { snapshot }),
time: { ...message.time, completed: event.created },
Expand Down Expand Up @@ -522,7 +496,6 @@ function startTextPart(
ordinal: number,
type: "reasoning" | "text",
at: number,
state?: ToolInput,
) {
const existing = findTextPart(message, ordinal, type);
if (existing) return message;
Expand All @@ -531,7 +504,6 @@ function startTextPart(
part = { text: "", type: "text" };
} else {
part = {
...(state === undefined ? {} : { state }),
text: "",
time: { created: at },
type: "reasoning",
Expand All @@ -546,19 +518,16 @@ function finishTextPart(
type: "reasoning" | "text",
at: number,
text: string,
state?: ToolInput,
) {
return updateTextPart(message, ordinal, type, (part) => {
if (part.type === "text") {
return {
...part,
...(state === undefined ? {} : { state }),
text,
};
}
return {
...part,
...(state === undefined ? {} : { state }),
text,
time: { created: part.time?.created ?? at, completed: at },
};
Expand Down Expand Up @@ -615,12 +584,10 @@ function setToolRunning(
input: ToolInput,
executed: boolean,
at: number,
providerState: ToolInput | undefined,
) {
return updateTool(message, id, (tool) => ({
...tool,
executed,
...(providerState === undefined ? {} : { providerState }),
state: { input, metadata: {}, status: "running" },
time: { ...tool.time, ran: at },
}));
Expand All @@ -639,12 +606,10 @@ function setToolCompleted(
metadata: ToolInput | undefined,
executed: boolean,
at: number,
providerResultState: ToolInput | undefined,
) {
return updateTool(message, id, (tool) => ({
...tool,
executed: executed || tool.executed === true,
...(providerResultState === undefined ? {} : { providerResultState }),
state: {
content: content as [ToolContent, ...ToolContent[]],
input: toolInput(tool),
Expand All @@ -663,14 +628,12 @@ function setToolFailed(
metadata: ToolInput | undefined,
executed: boolean,
at: number,
providerResultState: ToolInput | undefined,
) {
return updateTool(message, id, (tool) => {
const previousMetadata = tool.state.status === "running" ? tool.state.metadata : undefined;
return {
...tool,
executed: executed || tool.executed === true,
...(providerResultState === undefined ? {} : { providerResultState }),
state: {
...(content ? { content: content as [ToolContent, ...ToolContent[]] } : {}),
error,
Expand Down
2 changes: 1 addition & 1 deletion packages/opencode-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"typecheck": "tsc -p tsconfig.json"
},
"dependencies": {
"@opencode/client": "2.0.32"
"@opencode/client": "2.1.0"
},
"devDependencies": {
"@opencode2-mobile/test-fixtures": "workspace:*",
Expand Down
2 changes: 0 additions & 2 deletions packages/opencode-adapter/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1487,7 +1487,6 @@ it("loads every current message variant and follows descending cursors toward ol
{
id: "msg_compaction_running",
reason: "auto",
recent: "Recent",
status: "running",
summary: "Summary",
time: { created: 10 },
Expand All @@ -1496,7 +1495,6 @@ it("loads every current message variant and follows descending cursors toward ol
{
id: "msg_compaction_completed",
reason: "manual",
recent: "Recent",
status: "completed",
summary: "Summary",
time: { created: 11 },
Expand Down
5 changes: 2 additions & 3 deletions packages/opencode-adapter/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {

import { ensurePromiseWithResolvers } from "./promise-with-resolvers";

export const openCodeClientContractVersion = "2.0.32";
export const openCodeClientContractVersion = "2.1.0";

export type OpenCodeClientOptions = {
authorization?: string;
Expand Down Expand Up @@ -1002,8 +1002,7 @@ function isValidMessage(value: unknown): value is SessionMessageInfo {
if (value.status === "failed") return isStructuredError(value.error);
return (
(value.status === "running" || value.status === "completed") &&
typeof value.summary === "string" &&
typeof value.recent === "string"
typeof value.summary === "string"
);
default:
return false;
Expand Down
Loading
Loading