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
39 changes: 35 additions & 4 deletions packages/sdk/src/internal/core/session-runtime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ const TERMINAL_SESSION_STATUSES = new Set(["idle", "completed", "failed", "termi

const DEFAULT_POLL_INTERVAL_MS = 2000;
const DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1000;
const POLL_INITIAL_INTERVAL_MS = 300;

export function resolveAgentName(agents: Record<string, unknown> | undefined, agentName?: string): string {
if (agentName) return agentName;
Expand DownExpand Up@@ -258,8 +259,9 @@ export async function collectEventsUntilTerminal(
} = {},
): Promise<Omit<CollectedSessionEvents, "eventId">> {
const start = Date.now();
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
let terminalStatus = "idle";
let result: ProviderSessionEventList | undefined;

Expand All@@ -277,7 +279,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = terminalEvent.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}
} else {
while (true) {
Expand All@@ -287,7 +290,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = session.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}

result = await adapter.listSessionEvents(sessionId, { limit: 100 });
Expand DownExpand Up@@ -540,13 +544,40 @@ function buildAgentNameByRemoteId(ctx: ProjectRuntimeContext, provider: string):
}

// Qoder: send first (returns event ID), then stream from that ID to avoid missing events.
// When the provider closes the SSE connection mid-turn (e.g. after emitting a
// `session.status_idle` with `stop_reason=requires_action` for tool execution),
// we reconnect automatically until the stream delivers a true terminal status.
async function* streamWithResume(
adapter: SessionWorkflowAdapter,
sessionId: string,
message: string,
): AsyncIterable<ProviderSessionEvent> {
const eventId = await adapter.sendSessionMessage(sessionId, message);
yield* adapter.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : undefined);
let lastEventId: string | undefined = eventId;
let reachedTerminal = false;
let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
const start = Date.now();

while (!reachedTerminal) {
assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
for await (const event of adapter.streamSessionEvents(
sessionId,
lastEventId ? { after_id: lastEventId } : undefined,
)) {
if (event.id) lastEventId = event.id;
yield event;
if (event.type === "status" && isTerminalSessionStatus(event.status)) {
reachedTerminal = true;
break;
}
}
if (!reachedTerminal) {
// SSE closed without a terminal event — back off before reconnecting
// using exponential backoff capped at DEFAULT_POLL_INTERVAL_MS.
await delay(reconnectIntervalMs);
reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
}
}
}

// Claude/Bailian: connect stream first, then send — provider pushes events immediately on send.
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/src/internal/providers/base-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,7 @@ export abstract class BaseApiClient {
boundary = buffer.indexOf("\n\n");

const dataLines: string[] = [];
let sseId: string | undefined;
for (const line of frame.split("\n")) {
if (line.startsWith(":")) continue;
if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
Expand All@@ -113,12 +114,19 @@ export abstract class BaseApiClient {
if (line.startsWith("data:")) {
dataLines.push(line.slice(5).trimStart());
}
if (line.startsWith("id:")) {
sseId = line.slice(3).trimStart();
}
}
if (dataLines.length === 0) continue;

const json = dataLines.join("\n");
try {
yield JSON.parse(json) as Record<string, unknown>;
const parsed = JSON.parse(json) as Record<string, unknown>;
if (sseId !== undefined && parsed.id === undefined) {
parsed.id = sseId;
}
yield parsed;
} catch {
// skip unparseable frames
}
Expand Down
8 changes: 7 additions & 1 deletion packages/sdk/src/internal/providers/qoder/mapper.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,7 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
const type: SessionEventType = QODER_EVENT_MAP[rawType] ?? "unknown";

const event: ProviderSessionEvent = { type, raw_type: rawType, raw };
if (typeof raw.id === "string") event.id = raw.id;
if (typeof raw.role === "string") event.role = raw.role;

if (type === "message") {
Expand All@@ -567,12 +568,17 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
} else if (type === "status") {
// Only session-level idle/terminated are terminal; thread-level idle
// (session.thread_status_idle) is non-terminal and should not stop the stream.
// Additionally, session.status_idle with stop_reason "requires_action" means
// the agent paused for tool execution and will resume — treat it as non-terminal.
const stopReason = extractStopReason(raw.stop_reason);
if (rawType === "session.thread_status_idle") {
event.status = "running";
} else if (rawType === "session.status_idle" && stopReason === "requires_action") {
event.status = "running";
} else {
event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
}
event.stop_reason = extractStopReason(raw.stop_reason);
event.stop_reason = stopReason;
} else if (type === "error") {
event.content = extractErrorMessage(raw);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/tests/unit/session-event-mappers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,6 +205,11 @@ describe("Qoder mapper", () => {
expect(qoderToEvent({ type: "agent.tool_result", content: "result text" }).type).toBe("tool_result");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "end_turn" }).status).toBe("idle");
expect(qoderToEvent({ type: "session.status_running" }).status).toBe("running");
// requires_action means the agent paused for tool execution; not truly terminal
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "requires_action" }).status).toBe("running");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: { type: "requires_action" } }).status).toBe(
"running",
);
expect(qoderToEvent({ type: "agent.thinking" }).type).toBe("thinking");
const error = qoderToEvent({ type: "session.error", error: "timeout" });
expect(error.type).toBe("error");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
39 changes: 35 additions & 4 deletions packages/sdk/src/internal/core/session-runtime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ const TERMINAL_SESSION_STATUSES = new Set(["idle", "completed", "failed", "termi

const DEFAULT_POLL_INTERVAL_MS = 2000;
const DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1000;
const POLL_INITIAL_INTERVAL_MS = 300;

export function resolveAgentName(agents: Record<string, unknown> | undefined, agentName?: string): string {
if (agentName) return agentName;
Expand DownExpand Up@@ -258,8 +259,9 @@ export async function collectEventsUntilTerminal(
} = {},
): Promise<Omit<CollectedSessionEvents, "eventId">> {
const start = Date.now();
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
let terminalStatus = "idle";
let result: ProviderSessionEventList | undefined;

Expand All@@ -277,7 +279,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = terminalEvent.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}
} else {
while (true) {
Expand All@@ -287,7 +290,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = session.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}

result = await adapter.listSessionEvents(sessionId, { limit: 100 });
Expand DownExpand Up@@ -540,13 +544,40 @@ function buildAgentNameByRemoteId(ctx: ProjectRuntimeContext, provider: string):
}

// Qoder: send first (returns event ID), then stream from that ID to avoid missing events.
// When the provider closes the SSE connection mid-turn (e.g. after emitting a
// `session.status_idle` with `stop_reason=requires_action` for tool execution),
// we reconnect automatically until the stream delivers a true terminal status.
async function* streamWithResume(
adapter: SessionWorkflowAdapter,
sessionId: string,
message: string,
): AsyncIterable<ProviderSessionEvent> {
const eventId = await adapter.sendSessionMessage(sessionId, message);
yield* adapter.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : undefined);
let lastEventId: string | undefined = eventId;
let reachedTerminal = false;
let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
const start = Date.now();

while (!reachedTerminal) {
assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
for await (const event of adapter.streamSessionEvents(
sessionId,
lastEventId ? { after_id: lastEventId } : undefined,
)) {
if (event.id) lastEventId = event.id;
yield event;
if (event.type === "status" && isTerminalSessionStatus(event.status)) {
reachedTerminal = true;
break;
}
}
if (!reachedTerminal) {
// SSE closed without a terminal event — back off before reconnecting
// using exponential backoff capped at DEFAULT_POLL_INTERVAL_MS.
await delay(reconnectIntervalMs);
reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
}
}
}

// Claude/Bailian: connect stream first, then send — provider pushes events immediately on send.
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/src/internal/providers/base-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,7 @@ export abstract class BaseApiClient {
boundary = buffer.indexOf("\n\n");

const dataLines: string[] = [];
let sseId: string | undefined;
for (const line of frame.split("\n")) {
if (line.startsWith(":")) continue;
if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
Expand All@@ -113,12 +114,19 @@ export abstract class BaseApiClient {
if (line.startsWith("data:")) {
dataLines.push(line.slice(5).trimStart());
}
if (line.startsWith("id:")) {
sseId = line.slice(3).trimStart();
}
}
if (dataLines.length === 0) continue;

const json = dataLines.join("\n");
try {
yield JSON.parse(json) as Record<string, unknown>;
const parsed = JSON.parse(json) as Record<string, unknown>;
if (sseId !== undefined && parsed.id === undefined) {
parsed.id = sseId;
}
yield parsed;
} catch {
// skip unparseable frames
}
Expand Down
8 changes: 7 additions & 1 deletion packages/sdk/src/internal/providers/qoder/mapper.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,7 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
const type: SessionEventType = QODER_EVENT_MAP[rawType] ?? "unknown";

const event: ProviderSessionEvent = { type, raw_type: rawType, raw };
if (typeof raw.id === "string") event.id = raw.id;
if (typeof raw.role === "string") event.role = raw.role;

if (type === "message") {
Expand All@@ -567,12 +568,17 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
} else if (type === "status") {
// Only session-level idle/terminated are terminal; thread-level idle
// (session.thread_status_idle) is non-terminal and should not stop the stream.
// Additionally, session.status_idle with stop_reason "requires_action" means
// the agent paused for tool execution and will resume — treat it as non-terminal.
const stopReason = extractStopReason(raw.stop_reason);
if (rawType === "session.thread_status_idle") {
event.status = "running";
} else if (rawType === "session.status_idle" && stopReason === "requires_action") {
event.status = "running";
} else {
event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
}
event.stop_reason = extractStopReason(raw.stop_reason);
event.stop_reason = stopReason;
} else if (type === "error") {
event.content = extractErrorMessage(raw);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/tests/unit/session-event-mappers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,6 +205,11 @@ describe("Qoder mapper", () => {
expect(qoderToEvent({ type: "agent.tool_result", content: "result text" }).type).toBe("tool_result");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "end_turn" }).status).toBe("idle");
expect(qoderToEvent({ type: "session.status_running" }).status).toBe("running");
// requires_action means the agent paused for tool execution; not truly terminal
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "requires_action" }).status).toBe("running");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: { type: "requires_action" } }).status).toBe(
"running",
);
expect(qoderToEvent({ type: "agent.thinking" }).type).toBe("thinking");
const error = qoderToEvent({ type: "session.error", error: "timeout" });
expect(error.type).toBe("error");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
39 changes: 35 additions & 4 deletions packages/sdk/src/internal/core/session-runtime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ const TERMINAL_SESSION_STATUSES = new Set(["idle", "completed", "failed", "termi

const DEFAULT_POLL_INTERVAL_MS = 2000;
const DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1000;
const POLL_INITIAL_INTERVAL_MS = 300;

export function resolveAgentName(agents: Record<string, unknown> | undefined, agentName?: string): string {
if (agentName) return agentName;
Expand DownExpand Up@@ -258,8 +259,9 @@ export async function collectEventsUntilTerminal(
} = {},
): Promise<Omit<CollectedSessionEvents, "eventId">> {
const start = Date.now();
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
let terminalStatus = "idle";
let result: ProviderSessionEventList | undefined;

Expand All@@ -277,7 +279,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = terminalEvent.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}
} else {
while (true) {
Expand All@@ -287,7 +290,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = session.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}

result = await adapter.listSessionEvents(sessionId, { limit: 100 });
Expand DownExpand Up@@ -540,13 +544,40 @@ function buildAgentNameByRemoteId(ctx: ProjectRuntimeContext, provider: string):
}

// Qoder: send first (returns event ID), then stream from that ID to avoid missing events.
// When the provider closes the SSE connection mid-turn (e.g. after emitting a
// `session.status_idle` with `stop_reason=requires_action` for tool execution),
// we reconnect automatically until the stream delivers a true terminal status.
async function* streamWithResume(
adapter: SessionWorkflowAdapter,
sessionId: string,
message: string,
): AsyncIterable<ProviderSessionEvent> {
const eventId = await adapter.sendSessionMessage(sessionId, message);
yield* adapter.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : undefined);
let lastEventId: string | undefined = eventId;
let reachedTerminal = false;
let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
const start = Date.now();

while (!reachedTerminal) {
assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
for await (const event of adapter.streamSessionEvents(
sessionId,
lastEventId ? { after_id: lastEventId } : undefined,
)) {
if (event.id) lastEventId = event.id;
yield event;
if (event.type === "status" && isTerminalSessionStatus(event.status)) {
reachedTerminal = true;
break;
}
}
if (!reachedTerminal) {
// SSE closed without a terminal event — back off before reconnecting
// using exponential backoff capped at DEFAULT_POLL_INTERVAL_MS.
await delay(reconnectIntervalMs);
reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
}
}
}

// Claude/Bailian: connect stream first, then send — provider pushes events immediately on send.
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/src/internal/providers/base-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,7 @@ export abstract class BaseApiClient {
boundary = buffer.indexOf("\n\n");

const dataLines: string[] = [];
let sseId: string | undefined;
for (const line of frame.split("\n")) {
if (line.startsWith(":")) continue;
if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
Expand All@@ -113,12 +114,19 @@ export abstract class BaseApiClient {
if (line.startsWith("data:")) {
dataLines.push(line.slice(5).trimStart());
}
if (line.startsWith("id:")) {
sseId = line.slice(3).trimStart();
}
}
if (dataLines.length === 0) continue;

const json = dataLines.join("\n");
try {
yield JSON.parse(json) as Record<string, unknown>;
const parsed = JSON.parse(json) as Record<string, unknown>;
if (sseId !== undefined && parsed.id === undefined) {
parsed.id = sseId;
}
yield parsed;
} catch {
// skip unparseable frames
}
Expand Down
8 changes: 7 additions & 1 deletion packages/sdk/src/internal/providers/qoder/mapper.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,7 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
const type: SessionEventType = QODER_EVENT_MAP[rawType] ?? "unknown";

const event: ProviderSessionEvent = { type, raw_type: rawType, raw };
if (typeof raw.id === "string") event.id = raw.id;
if (typeof raw.role === "string") event.role = raw.role;

if (type === "message") {
Expand All@@ -567,12 +568,17 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
} else if (type === "status") {
// Only session-level idle/terminated are terminal; thread-level idle
// (session.thread_status_idle) is non-terminal and should not stop the stream.
// Additionally, session.status_idle with stop_reason "requires_action" means
// the agent paused for tool execution and will resume — treat it as non-terminal.
const stopReason = extractStopReason(raw.stop_reason);
if (rawType === "session.thread_status_idle") {
event.status = "running";
} else if (rawType === "session.status_idle" && stopReason === "requires_action") {
event.status = "running";
} else {
event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
}
event.stop_reason = extractStopReason(raw.stop_reason);
event.stop_reason = stopReason;
} else if (type === "error") {
event.content = extractErrorMessage(raw);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/tests/unit/session-event-mappers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,6 +205,11 @@ describe("Qoder mapper", () => {
expect(qoderToEvent({ type: "agent.tool_result", content: "result text" }).type).toBe("tool_result");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "end_turn" }).status).toBe("idle");
expect(qoderToEvent({ type: "session.status_running" }).status).toBe("running");
// requires_action means the agent paused for tool execution; not truly terminal
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "requires_action" }).status).toBe("running");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: { type: "requires_action" } }).status).toBe(
"running",
);
expect(qoderToEvent({ type: "agent.thinking" }).type).toBe("thinking");
const error = qoderToEvent({ type: "session.error", error: "timeout" });
expect(error.type).toBe("error");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
39 changes: 35 additions & 4 deletions packages/sdk/src/internal/core/session-runtime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ const TERMINAL_SESSION_STATUSES = new Set(["idle", "completed", "failed", "termi

const DEFAULT_POLL_INTERVAL_MS = 2000;
const DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1000;
const POLL_INITIAL_INTERVAL_MS = 300;

export function resolveAgentName(agents: Record<string, unknown> | undefined, agentName?: string): string {
if (agentName) return agentName;
Expand DownExpand Up@@ -258,8 +259,9 @@ export async function collectEventsUntilTerminal(
} = {},
): Promise<Omit<CollectedSessionEvents, "eventId">> {
const start = Date.now();
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
let terminalStatus = "idle";
let result: ProviderSessionEventList | undefined;

Expand All@@ -277,7 +279,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = terminalEvent.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}
} else {
while (true) {
Expand All@@ -287,7 +290,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = session.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}

result = await adapter.listSessionEvents(sessionId, { limit: 100 });
Expand DownExpand Up@@ -540,13 +544,40 @@ function buildAgentNameByRemoteId(ctx: ProjectRuntimeContext, provider: string):
}

// Qoder: send first (returns event ID), then stream from that ID to avoid missing events.
// When the provider closes the SSE connection mid-turn (e.g. after emitting a
// `session.status_idle` with `stop_reason=requires_action` for tool execution),
// we reconnect automatically until the stream delivers a true terminal status.
async function* streamWithResume(
adapter: SessionWorkflowAdapter,
sessionId: string,
message: string,
): AsyncIterable<ProviderSessionEvent> {
const eventId = await adapter.sendSessionMessage(sessionId, message);
yield* adapter.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : undefined);
let lastEventId: string | undefined = eventId;
let reachedTerminal = false;
let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
const start = Date.now();

while (!reachedTerminal) {
assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
for await (const event of adapter.streamSessionEvents(
sessionId,
lastEventId ? { after_id: lastEventId } : undefined,
)) {
if (event.id) lastEventId = event.id;
yield event;
if (event.type === "status" && isTerminalSessionStatus(event.status)) {
reachedTerminal = true;
break;
}
}
if (!reachedTerminal) {
// SSE closed without a terminal event — back off before reconnecting
// using exponential backoff capped at DEFAULT_POLL_INTERVAL_MS.
await delay(reconnectIntervalMs);
reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
}
}
}

// Claude/Bailian: connect stream first, then send — provider pushes events immediately on send.
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/src/internal/providers/base-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,7 @@ export abstract class BaseApiClient {
boundary = buffer.indexOf("\n\n");

const dataLines: string[] = [];
let sseId: string | undefined;
for (const line of frame.split("\n")) {
if (line.startsWith(":")) continue;
if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
Expand All@@ -113,12 +114,19 @@ export abstract class BaseApiClient {
if (line.startsWith("data:")) {
dataLines.push(line.slice(5).trimStart());
}
if (line.startsWith("id:")) {
sseId = line.slice(3).trimStart();
}
}
if (dataLines.length === 0) continue;

const json = dataLines.join("\n");
try {
yield JSON.parse(json) as Record<string, unknown>;
const parsed = JSON.parse(json) as Record<string, unknown>;
if (sseId !== undefined && parsed.id === undefined) {
parsed.id = sseId;
}
yield parsed;
} catch {
// skip unparseable frames
}
Expand Down
8 changes: 7 additions & 1 deletion packages/sdk/src/internal/providers/qoder/mapper.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,7 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
const type: SessionEventType = QODER_EVENT_MAP[rawType] ?? "unknown";

const event: ProviderSessionEvent = { type, raw_type: rawType, raw };
if (typeof raw.id === "string") event.id = raw.id;
if (typeof raw.role === "string") event.role = raw.role;

if (type === "message") {
Expand All@@ -567,12 +568,17 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
} else if (type === "status") {
// Only session-level idle/terminated are terminal; thread-level idle
// (session.thread_status_idle) is non-terminal and should not stop the stream.
// Additionally, session.status_idle with stop_reason "requires_action" means
// the agent paused for tool execution and will resume — treat it as non-terminal.
const stopReason = extractStopReason(raw.stop_reason);
if (rawType === "session.thread_status_idle") {
event.status = "running";
} else if (rawType === "session.status_idle" && stopReason === "requires_action") {
event.status = "running";
} else {
event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
}
event.stop_reason = extractStopReason(raw.stop_reason);
event.stop_reason = stopReason;
} else if (type === "error") {
event.content = extractErrorMessage(raw);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/tests/unit/session-event-mappers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,6 +205,11 @@ describe("Qoder mapper", () => {
expect(qoderToEvent({ type: "agent.tool_result", content: "result text" }).type).toBe("tool_result");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "end_turn" }).status).toBe("idle");
expect(qoderToEvent({ type: "session.status_running" }).status).toBe("running");
// requires_action means the agent paused for tool execution; not truly terminal
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "requires_action" }).status).toBe("running");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: { type: "requires_action" } }).status).toBe(
"running",
);
expect(qoderToEvent({ type: "agent.thinking" }).type).toBe("thinking");
const error = qoderToEvent({ type: "session.error", error: "timeout" });
expect(error.type).toBe("error");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
39 changes: 35 additions & 4 deletions packages/sdk/src/internal/core/session-runtime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ const TERMINAL_SESSION_STATUSES = new Set(["idle", "completed", "failed", "termi

const DEFAULT_POLL_INTERVAL_MS = 2000;
const DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1000;
const POLL_INITIAL_INTERVAL_MS = 300;

export function resolveAgentName(agents: Record<string, unknown> | undefined, agentName?: string): string {
if (agentName) return agentName;
Expand DownExpand Up@@ -258,8 +259,9 @@ export async function collectEventsUntilTerminal(
} = {},
): Promise<Omit<CollectedSessionEvents, "eventId">> {
const start = Date.now();
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
let terminalStatus = "idle";
let result: ProviderSessionEventList | undefined;

Expand All@@ -277,7 +279,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = terminalEvent.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}
} else {
while (true) {
Expand All@@ -287,7 +290,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = session.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}

result = await adapter.listSessionEvents(sessionId, { limit: 100 });
Expand DownExpand Up@@ -540,13 +544,40 @@ function buildAgentNameByRemoteId(ctx: ProjectRuntimeContext, provider: string):
}

// Qoder: send first (returns event ID), then stream from that ID to avoid missing events.
// When the provider closes the SSE connection mid-turn (e.g. after emitting a
// `session.status_idle` with `stop_reason=requires_action` for tool execution),
// we reconnect automatically until the stream delivers a true terminal status.
async function* streamWithResume(
adapter: SessionWorkflowAdapter,
sessionId: string,
message: string,
): AsyncIterable<ProviderSessionEvent> {
const eventId = await adapter.sendSessionMessage(sessionId, message);
yield* adapter.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : undefined);
let lastEventId: string | undefined = eventId;
let reachedTerminal = false;
let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
const start = Date.now();

while (!reachedTerminal) {
assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
for await (const event of adapter.streamSessionEvents(
sessionId,
lastEventId ? { after_id: lastEventId } : undefined,
)) {
if (event.id) lastEventId = event.id;
yield event;
if (event.type === "status" && isTerminalSessionStatus(event.status)) {
reachedTerminal = true;
break;
}
}
if (!reachedTerminal) {
// SSE closed without a terminal event — back off before reconnecting
// using exponential backoff capped at DEFAULT_POLL_INTERVAL_MS.
await delay(reconnectIntervalMs);
reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
}
}
}

// Claude/Bailian: connect stream first, then send — provider pushes events immediately on send.
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/src/internal/providers/base-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,7 @@ export abstract class BaseApiClient {
boundary = buffer.indexOf("\n\n");

const dataLines: string[] = [];
let sseId: string | undefined;
for (const line of frame.split("\n")) {
if (line.startsWith(":")) continue;
if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
Expand All@@ -113,12 +114,19 @@ export abstract class BaseApiClient {
if (line.startsWith("data:")) {
dataLines.push(line.slice(5).trimStart());
}
if (line.startsWith("id:")) {
sseId = line.slice(3).trimStart();
}
}
if (dataLines.length === 0) continue;

const json = dataLines.join("\n");
try {
yield JSON.parse(json) as Record<string, unknown>;
const parsed = JSON.parse(json) as Record<string, unknown>;
if (sseId !== undefined && parsed.id === undefined) {
parsed.id = sseId;
}
yield parsed;
} catch {
// skip unparseable frames
}
Expand Down
8 changes: 7 additions & 1 deletion packages/sdk/src/internal/providers/qoder/mapper.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,7 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
const type: SessionEventType = QODER_EVENT_MAP[rawType] ?? "unknown";

const event: ProviderSessionEvent = { type, raw_type: rawType, raw };
if (typeof raw.id === "string") event.id = raw.id;
if (typeof raw.role === "string") event.role = raw.role;

if (type === "message") {
Expand All@@ -567,12 +568,17 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
} else if (type === "status") {
// Only session-level idle/terminated are terminal; thread-level idle
// (session.thread_status_idle) is non-terminal and should not stop the stream.
// Additionally, session.status_idle with stop_reason "requires_action" means
// the agent paused for tool execution and will resume — treat it as non-terminal.
const stopReason = extractStopReason(raw.stop_reason);
if (rawType === "session.thread_status_idle") {
event.status = "running";
} else if (rawType === "session.status_idle" && stopReason === "requires_action") {
event.status = "running";
} else {
event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
}
event.stop_reason = extractStopReason(raw.stop_reason);
event.stop_reason = stopReason;
} else if (type === "error") {
event.content = extractErrorMessage(raw);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/tests/unit/session-event-mappers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,6 +205,11 @@ describe("Qoder mapper", () => {
expect(qoderToEvent({ type: "agent.tool_result", content: "result text" }).type).toBe("tool_result");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "end_turn" }).status).toBe("idle");
expect(qoderToEvent({ type: "session.status_running" }).status).toBe("running");
// requires_action means the agent paused for tool execution; not truly terminal
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "requires_action" }).status).toBe("running");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: { type: "requires_action" } }).status).toBe(
"running",
);
expect(qoderToEvent({ type: "agent.thinking" }).type).toBe("thinking");
const error = qoderToEvent({ type: "session.error", error: "timeout" });
expect(error.type).toBe("error");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
39 changes: 35 additions & 4 deletions packages/sdk/src/internal/core/session-runtime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ const TERMINAL_SESSION_STATUSES = new Set(["idle", "completed", "failed", "termi

const DEFAULT_POLL_INTERVAL_MS = 2000;
const DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1000;
const POLL_INITIAL_INTERVAL_MS = 300;

export function resolveAgentName(agents: Record<string, unknown> | undefined, agentName?: string): string {
if (agentName) return agentName;
Expand DownExpand Up@@ -258,8 +259,9 @@ export async function collectEventsUntilTerminal(
} = {},
): Promise<Omit<CollectedSessionEvents, "eventId">> {
const start = Date.now();
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
let terminalStatus = "idle";
let result: ProviderSessionEventList | undefined;

Expand All@@ -277,7 +279,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = terminalEvent.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}
} else {
while (true) {
Expand All@@ -287,7 +290,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = session.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}

result = await adapter.listSessionEvents(sessionId, { limit: 100 });
Expand DownExpand Up@@ -540,13 +544,40 @@ function buildAgentNameByRemoteId(ctx: ProjectRuntimeContext, provider: string):
}

// Qoder: send first (returns event ID), then stream from that ID to avoid missing events.
// When the provider closes the SSE connection mid-turn (e.g. after emitting a
// `session.status_idle` with `stop_reason=requires_action` for tool execution),
// we reconnect automatically until the stream delivers a true terminal status.
async function* streamWithResume(
adapter: SessionWorkflowAdapter,
sessionId: string,
message: string,
): AsyncIterable<ProviderSessionEvent> {
const eventId = await adapter.sendSessionMessage(sessionId, message);
yield* adapter.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : undefined);
let lastEventId: string | undefined = eventId;
let reachedTerminal = false;
let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
const start = Date.now();

while (!reachedTerminal) {
assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
for await (const event of adapter.streamSessionEvents(
sessionId,
lastEventId ? { after_id: lastEventId } : undefined,
)) {
if (event.id) lastEventId = event.id;
yield event;
if (event.type === "status" && isTerminalSessionStatus(event.status)) {
reachedTerminal = true;
break;
}
}
if (!reachedTerminal) {
// SSE closed without a terminal event — back off before reconnecting
// using exponential backoff capped at DEFAULT_POLL_INTERVAL_MS.
await delay(reconnectIntervalMs);
reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
}
}
}

// Claude/Bailian: connect stream first, then send — provider pushes events immediately on send.
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/src/internal/providers/base-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,7 @@ export abstract class BaseApiClient {
boundary = buffer.indexOf("\n\n");

const dataLines: string[] = [];
let sseId: string | undefined;
for (const line of frame.split("\n")) {
if (line.startsWith(":")) continue;
if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
Expand All@@ -113,12 +114,19 @@ export abstract class BaseApiClient {
if (line.startsWith("data:")) {
dataLines.push(line.slice(5).trimStart());
}
if (line.startsWith("id:")) {
sseId = line.slice(3).trimStart();
}
}
if (dataLines.length === 0) continue;

const json = dataLines.join("\n");
try {
yield JSON.parse(json) as Record<string, unknown>;
const parsed = JSON.parse(json) as Record<string, unknown>;
if (sseId !== undefined && parsed.id === undefined) {
parsed.id = sseId;
}
yield parsed;
} catch {
// skip unparseable frames
}
Expand Down
8 changes: 7 additions & 1 deletion packages/sdk/src/internal/providers/qoder/mapper.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,7 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
const type: SessionEventType = QODER_EVENT_MAP[rawType] ?? "unknown";

const event: ProviderSessionEvent = { type, raw_type: rawType, raw };
if (typeof raw.id === "string") event.id = raw.id;
if (typeof raw.role === "string") event.role = raw.role;

if (type === "message") {
Expand All@@ -567,12 +568,17 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
} else if (type === "status") {
// Only session-level idle/terminated are terminal; thread-level idle
// (session.thread_status_idle) is non-terminal and should not stop the stream.
// Additionally, session.status_idle with stop_reason "requires_action" means
// the agent paused for tool execution and will resume — treat it as non-terminal.
const stopReason = extractStopReason(raw.stop_reason);
if (rawType === "session.thread_status_idle") {
event.status = "running";
} else if (rawType === "session.status_idle" && stopReason === "requires_action") {
event.status = "running";
} else {
event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
}
event.stop_reason = extractStopReason(raw.stop_reason);
event.stop_reason = stopReason;
} else if (type === "error") {
event.content = extractErrorMessage(raw);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/tests/unit/session-event-mappers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,6 +205,11 @@ describe("Qoder mapper", () => {
expect(qoderToEvent({ type: "agent.tool_result", content: "result text" }).type).toBe("tool_result");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "end_turn" }).status).toBe("idle");
expect(qoderToEvent({ type: "session.status_running" }).status).toBe("running");
// requires_action means the agent paused for tool execution; not truly terminal
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "requires_action" }).status).toBe("running");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: { type: "requires_action" } }).status).toBe(
"running",
);
expect(qoderToEvent({ type: "agent.thinking" }).type).toBe("thinking");
const error = qoderToEvent({ type: "session.error", error: "timeout" });
expect(error.type).toBe("error");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
39 changes: 35 additions & 4 deletions packages/sdk/src/internal/core/session-runtime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ const TERMINAL_SESSION_STATUSES = new Set(["idle", "completed", "failed", "termi

const DEFAULT_POLL_INTERVAL_MS = 2000;
const DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1000;
const POLL_INITIAL_INTERVAL_MS = 300;

export function resolveAgentName(agents: Record<string, unknown> | undefined, agentName?: string): string {
if (agentName) return agentName;
Expand DownExpand Up@@ -258,8 +259,9 @@ export async function collectEventsUntilTerminal(
} = {},
): Promise<Omit<CollectedSessionEvents, "eventId">> {
const start = Date.now();
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
let terminalStatus = "idle";
let result: ProviderSessionEventList | undefined;

Expand All@@ -277,7 +279,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = terminalEvent.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}
} else {
while (true) {
Expand All@@ -287,7 +290,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = session.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}

result = await adapter.listSessionEvents(sessionId, { limit: 100 });
Expand DownExpand Up@@ -540,13 +544,40 @@ function buildAgentNameByRemoteId(ctx: ProjectRuntimeContext, provider: string):
}

// Qoder: send first (returns event ID), then stream from that ID to avoid missing events.
// When the provider closes the SSE connection mid-turn (e.g. after emitting a
// `session.status_idle` with `stop_reason=requires_action` for tool execution),
// we reconnect automatically until the stream delivers a true terminal status.
async function* streamWithResume(
adapter: SessionWorkflowAdapter,
sessionId: string,
message: string,
): AsyncIterable<ProviderSessionEvent> {
const eventId = await adapter.sendSessionMessage(sessionId, message);
yield* adapter.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : undefined);
let lastEventId: string | undefined = eventId;
let reachedTerminal = false;
let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
const start = Date.now();

while (!reachedTerminal) {
assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
for await (const event of adapter.streamSessionEvents(
sessionId,
lastEventId ? { after_id: lastEventId } : undefined,
)) {
if (event.id) lastEventId = event.id;
yield event;
if (event.type === "status" && isTerminalSessionStatus(event.status)) {
reachedTerminal = true;
break;
}
}
if (!reachedTerminal) {
// SSE closed without a terminal event — back off before reconnecting
// using exponential backoff capped at DEFAULT_POLL_INTERVAL_MS.
await delay(reconnectIntervalMs);
reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
}
}
}

// Claude/Bailian: connect stream first, then send — provider pushes events immediately on send.
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/src/internal/providers/base-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,7 @@ export abstract class BaseApiClient {
boundary = buffer.indexOf("\n\n");

const dataLines: string[] = [];
let sseId: string | undefined;
for (const line of frame.split("\n")) {
if (line.startsWith(":")) continue;
if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
Expand All@@ -113,12 +114,19 @@ export abstract class BaseApiClient {
if (line.startsWith("data:")) {
dataLines.push(line.slice(5).trimStart());
}
if (line.startsWith("id:")) {
sseId = line.slice(3).trimStart();
}
}
if (dataLines.length === 0) continue;

const json = dataLines.join("\n");
try {
yield JSON.parse(json) as Record<string, unknown>;
const parsed = JSON.parse(json) as Record<string, unknown>;
if (sseId !== undefined && parsed.id === undefined) {
parsed.id = sseId;
}
yield parsed;
} catch {
// skip unparseable frames
}
Expand Down
8 changes: 7 additions & 1 deletion packages/sdk/src/internal/providers/qoder/mapper.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,7 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
const type: SessionEventType = QODER_EVENT_MAP[rawType] ?? "unknown";

const event: ProviderSessionEvent = { type, raw_type: rawType, raw };
if (typeof raw.id === "string") event.id = raw.id;
if (typeof raw.role === "string") event.role = raw.role;

if (type === "message") {
Expand All@@ -567,12 +568,17 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
} else if (type === "status") {
// Only session-level idle/terminated are terminal; thread-level idle
// (session.thread_status_idle) is non-terminal and should not stop the stream.
// Additionally, session.status_idle with stop_reason "requires_action" means
// the agent paused for tool execution and will resume — treat it as non-terminal.
const stopReason = extractStopReason(raw.stop_reason);
if (rawType === "session.thread_status_idle") {
event.status = "running";
} else if (rawType === "session.status_idle" && stopReason === "requires_action") {
event.status = "running";
} else {
event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
}
event.stop_reason = extractStopReason(raw.stop_reason);
event.stop_reason = stopReason;
} else if (type === "error") {
event.content = extractErrorMessage(raw);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/tests/unit/session-event-mappers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,6 +205,11 @@ describe("Qoder mapper", () => {
expect(qoderToEvent({ type: "agent.tool_result", content: "result text" }).type).toBe("tool_result");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "end_turn" }).status).toBe("idle");
expect(qoderToEvent({ type: "session.status_running" }).status).toBe("running");
// requires_action means the agent paused for tool execution; not truly terminal
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "requires_action" }).status).toBe("running");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: { type: "requires_action" } }).status).toBe(
"running",
);
expect(qoderToEvent({ type: "agent.thinking" }).type).toBe("thinking");
const error = qoderToEvent({ type: "session.error", error: "timeout" });
expect(error.type).toBe("error");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
39 changes: 35 additions & 4 deletions packages/sdk/src/internal/core/session-runtime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ const TERMINAL_SESSION_STATUSES = new Set(["idle", "completed", "failed", "termi

const DEFAULT_POLL_INTERVAL_MS = 2000;
const DEFAULT_POLL_TIMEOUT_MS = 10 * 60 * 1000;
const POLL_INITIAL_INTERVAL_MS = 300;

export function resolveAgentName(agents: Record<string, unknown> | undefined, agentName?: string): string {
if (agentName) return agentName;
Expand DownExpand Up@@ -258,8 +259,9 @@ export async function collectEventsUntilTerminal(
} = {},
): Promise<Omit<CollectedSessionEvents, "eventId">> {
const start = Date.now();
const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const maxPollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
let currentIntervalMs = Math.min(POLL_INITIAL_INTERVAL_MS, maxPollIntervalMs);
let terminalStatus = "idle";
let result: ProviderSessionEventList | undefined;

Expand All@@ -277,7 +279,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = terminalEvent.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}
} else {
while (true) {
Expand All@@ -287,7 +290,8 @@ export async function collectEventsUntilTerminal(
terminalStatus = session.status;
break;
}
await delay(pollIntervalMs);
await delay(currentIntervalMs);
currentIntervalMs = Math.min(currentIntervalMs * 2, maxPollIntervalMs);
}

result = await adapter.listSessionEvents(sessionId, { limit: 100 });
Expand DownExpand Up@@ -540,13 +544,40 @@ function buildAgentNameByRemoteId(ctx: ProjectRuntimeContext, provider: string):
}

// Qoder: send first (returns event ID), then stream from that ID to avoid missing events.
// When the provider closes the SSE connection mid-turn (e.g. after emitting a
// `session.status_idle` with `stop_reason=requires_action` for tool execution),
// we reconnect automatically until the stream delivers a true terminal status.
async function* streamWithResume(
adapter: SessionWorkflowAdapter,
sessionId: string,
message: string,
): AsyncIterable<ProviderSessionEvent> {
const eventId = await adapter.sendSessionMessage(sessionId, message);
yield* adapter.streamSessionEvents(sessionId, eventId ? { after_id: eventId } : undefined);
let lastEventId: string | undefined = eventId;
let reachedTerminal = false;
let reconnectIntervalMs = POLL_INITIAL_INTERVAL_MS;
const start = Date.now();

while (!reachedTerminal) {
assertNotTimedOut(start, DEFAULT_POLL_TIMEOUT_MS);
for await (const event of adapter.streamSessionEvents(
sessionId,
lastEventId ? { after_id: lastEventId } : undefined,
)) {
if (event.id) lastEventId = event.id;
yield event;
if (event.type === "status" && isTerminalSessionStatus(event.status)) {
reachedTerminal = true;
break;
}
}
if (!reachedTerminal) {
// SSE closed without a terminal event — back off before reconnecting
// using exponential backoff capped at DEFAULT_POLL_INTERVAL_MS.
await delay(reconnectIntervalMs);
reconnectIntervalMs = Math.min(reconnectIntervalMs * 2, DEFAULT_POLL_INTERVAL_MS);
}
}
}

// Claude/Bailian: connect stream first, then send — provider pushes events immediately on send.
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/src/internal/providers/base-client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,6 +104,7 @@ export abstract class BaseApiClient {
boundary = buffer.indexOf("\n\n");

const dataLines: string[] = [];
let sseId: string | undefined;
for (const line of frame.split("\n")) {
if (line.startsWith(":")) continue;
if (line.startsWith("event:") && line.slice(6).trim() === "heartbeat") {
Expand All@@ -113,12 +114,19 @@ export abstract class BaseApiClient {
if (line.startsWith("data:")) {
dataLines.push(line.slice(5).trimStart());
}
if (line.startsWith("id:")) {
sseId = line.slice(3).trimStart();
}
}
if (dataLines.length === 0) continue;

const json = dataLines.join("\n");
try {
yield JSON.parse(json) as Record<string, unknown>;
const parsed = JSON.parse(json) as Record<string, unknown>;
if (sseId !== undefined && parsed.id === undefined) {
parsed.id = sseId;
}
yield parsed;
} catch {
// skip unparseable frames
}
Expand Down
8 changes: 7 additions & 1 deletion packages/sdk/src/internal/providers/qoder/mapper.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -551,6 +551,7 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
const type: SessionEventType = QODER_EVENT_MAP[rawType] ?? "unknown";

const event: ProviderSessionEvent = { type, raw_type: rawType, raw };
if (typeof raw.id === "string") event.id = raw.id;
if (typeof raw.role === "string") event.role = raw.role;

if (type === "message") {
Expand All@@ -567,12 +568,17 @@ export function toSessionEvent(raw: Record<string, unknown>): ProviderSessionEve
} else if (type === "status") {
// Only session-level idle/terminated are terminal; thread-level idle
// (session.thread_status_idle) is non-terminal and should not stop the stream.
// Additionally, session.status_idle with stop_reason "requires_action" means
// the agent paused for tool execution and will resume — treat it as non-terminal.
const stopReason = extractStopReason(raw.stop_reason);
if (rawType === "session.thread_status_idle") {
event.status = "running";
} else if (rawType === "session.status_idle" && stopReason === "requires_action") {
event.status = "running";
} else {
event.status = rawType.includes("idle") ? "idle" : rawType.includes("terminated") ? "terminated" : "running";
}
event.stop_reason = extractStopReason(raw.stop_reason);
event.stop_reason = stopReason;
} else if (type === "error") {
event.content = extractErrorMessage(raw);
}
Expand Down
5 changes: 5 additions & 0 deletions packages/sdk/tests/unit/session-event-mappers.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,6 +205,11 @@ describe("Qoder mapper", () => {
expect(qoderToEvent({ type: "agent.tool_result", content: "result text" }).type).toBe("tool_result");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "end_turn" }).status).toBe("idle");
expect(qoderToEvent({ type: "session.status_running" }).status).toBe("running");
// requires_action means the agent paused for tool execution; not truly terminal
expect(qoderToEvent({ type: "session.status_idle", stop_reason: "requires_action" }).status).toBe("running");
expect(qoderToEvent({ type: "session.status_idle", stop_reason: { type: "requires_action" } }).status).toBe(
"running",
);
expect(qoderToEvent({ type: "agent.thinking" }).type).toBe("thinking");
const error = qoderToEvent({ type: "session.error", error: "timeout" });
expect(error.type).toBe("error");
Expand Down