@gitterm/sdk 0.6.0 → 0.7.0

package/dist/direct/types.d.ts

@@ -31,51 +31,88 @@ export type DirectOAuthModelCredential = {
     enterpriseUrl?: string;
 };
 export type DirectModelCredential = DirectApiModelCredential | DirectOAuthModelCredential;
-export type DirectAuthPrompt = {
-    type: "text";
+type DirectAuthPromptBase = {
     key: string;
-    message: string;
-    placeholder?: string;
-    when?: {
+    title?: string;
+    description?: string;
+    required?: boolean;
+    hidden?: boolean;
+    /** Show the field only when every condition holds for an earlier answer. */
+    when?: Array<{
         key: string;
         op: "eq" | "neq";
-        value: string;
-    };
-} | {
-    type: "select";
-    key: string;
-    message: string;
-    options: Array<{
-        label: string;
-        value: string;
-        hint?: string;
+        value: string | number | boolean;
     }>;
-    when?: {
-        key: string;
-        op: "eq" | "neq";
-        value: string;
-    };
 };
+type DirectAuthPromptOption = {
+    value: string;
+    label: string;
+    description?: string;
+};
+type DirectAuthPromptNumber = number | "Infinity" | "-Infinity" | "NaN";
+/** A field an OAuth or key method asks for (OpenCode 2 `FormField`); answer it with `connectOAuth({ inputs })`. */
+export type DirectAuthPrompt = (DirectAuthPromptBase & {
+    type: "string";
+    format?: "email" | "uri" | "date" | "date-time";
+    minLength?: number;
+    maxLength?: number;
+    pattern?: string;
+    placeholder?: string;
+    default?: string;
+    options?: DirectAuthPromptOption[];
+    custom?: boolean;
+}) | (DirectAuthPromptBase & {
+    type: "number" | "integer";
+    minimum?: DirectAuthPromptNumber;
+    maximum?: DirectAuthPromptNumber;
+    default?: DirectAuthPromptNumber;
+}) | (DirectAuthPromptBase & {
+    type: "boolean";
+    default?: boolean;
+}) | (DirectAuthPromptBase & {
+    type: "multiselect";
+    options: DirectAuthPromptOption[];
+    minItems?: number;
+    maxItems?: number;
+    custom?: boolean;
+    default?: string[];
+}) | {
+    key: string;
+    type: "external";
+    url: string;
+    title?: string;
+    description?: string;
+};
+/** OpenCode 2 `IntegrationMethod`. */
 export type DirectAuthMethod = {
     type: "oauth";
     id: string;
     label: string;
-    prompts?: DirectAuthPrompt[];
+    form?: DirectAuthPrompt[];
+} | {
+    type: "command";
+    id: string;
+    label: string;
+    command: string[];
 } | {
     type: "key";
     label?: string;
+    form?: DirectAuthPrompt[];
 } | {
     type: "env";
     names: string[];
 };
+/** OpenCode 2 `IntegrationInfo`. */
 export type DirectAuthIntegration = {
     id: string;
     name: string;
+    metadata?: Record<string, unknown>;
     methods: DirectAuthMethod[];
     connections: Array<{
         type: "credential";
         id: string;
         label: string;
+        method: "key" | "oauth";
     } | {
         type: "env";
         name: string;
@@ -321,3 +358,4 @@ export type DirectRun = AgentRun & {
 };
 export type DirectRunMessage = AgentRunMessage;
 export type DirectRunWaitOptions = RunWaitOptions;
+export {};

package/dist/index.js

@@ -112,6 +112,23 @@ function normalizeServerUrl(value) {
   url.search = "";
   return url.toString().replace(/\/$/, "");
 }
+function withPath(serverUrl, pathname) {
+  const url = new URL(serverUrl);
+  url.pathname = pathname;
+  return url.toString();
+}
+function basePath(serverUrl) {
+  return new URL(serverUrl).pathname.replace(/\/+$/, "");
+}
+function trpcEndpoint(serverUrl) {
+  const base = basePath(serverUrl);
+  return withPath(serverUrl, base.endsWith("/trpc") ? base : `${base}/trpc`);
+}
+function apiEndpoint(serverUrl, route) {
+  const base = basePath(serverUrl);
+  const apiBase = base.endsWith("/api") ? base : `${base}/api`;
+  return withPath(serverUrl, `${apiBase}/${route.replace(/^\/+/, "")}`);
+}
 function createNoRedirectFetch(fetchImpl = fetch) {
   return async (input, init) => {
     const response = await fetchImpl(input, { ...init, redirect: "manual" });
@@ -286,9 +303,6 @@ function resolveCredentials(options) {
   }
   return { serverUrl: normalizeServerUrl(serverUrl), token };
 }
-function toTrpcUrl(serverUrl) {
-  return new URL("/trpc", serverUrl).toString();
-}
 function toIso(value) {
   if (!value)
     return null;
@@ -492,14 +506,14 @@ function createGittermClient(options = {}) {
       splitLink({
         condition: (operation) => operation.type === "subscription",
         true: httpSubscriptionLink({
-          url: toTrpcUrl(credentials.serverUrl),
+          url: trpcEndpoint(credentials.serverUrl),
           EventSource,
           eventSourceOptions: {
             fetch: (url, init) => fetchImpl(url, { ...init, headers: { ...init.headers, authorization } })
           }
         }),
         false: httpBatchLink({
-          url: toTrpcUrl(credentials.serverUrl),
+          url: trpcEndpoint(credentials.serverUrl),
           fetch: fetchImpl,
           headers: () => ({ authorization })
         })
@@ -747,7 +761,7 @@ function sleep2(ms) {
 async function loginWithDeviceCode(serverUrl, options = {}) {
   const normalizedServerUrl = normalizeServerUrl(serverUrl);
   const fetchImpl = createNoRedirectFetch(options.fetch);
-  const codeRes = await fetchImpl(new URL("/api/device/code", normalizedServerUrl), {
+  const codeRes = await fetchImpl(apiEndpoint(normalizedServerUrl, "device/code"), {
     method: "POST",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({ clientName: options.clientName ?? "gitterm" })
@@ -763,7 +777,7 @@ async function loginWithDeviceCode(serverUrl, options = {}) {
   });
   const deadline = Date.now() + codeJson.expiresInSeconds * 1000;
   while (Date.now() < deadline) {
-    const tokenRes = await fetchImpl(new URL("/api/device/token", normalizedServerUrl), {
+    const tokenRes = await fetchImpl(apiEndpoint(normalizedServerUrl, "device/token"), {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify({ deviceCode: codeJson.deviceCode })
@@ -802,10 +816,6 @@ function errorCode(code) {
     return code;
   return "SERVER_ERROR";
 }
-function toWorkspaceTrpcUrl(serverUrl) {
-  const url = new URL(serverUrl);
-  return url.pathname.endsWith("/trpc") ? serverUrl : new URL("/trpc", url).toString();
-}
 function createGittermWorkspaceClient(options = {}) {
   const detected = options.serverUrl && options.token && options.workspaceId ? null : getWorkspaceEnvironment();
   const rawServerUrl = options.serverUrl ?? detected?.serverUrl;
@@ -818,7 +828,7 @@ function createGittermWorkspaceClient(options = {}) {
   const trpc = createTRPCClient2({
     links: [
       httpBatchLink2({
-        url: toWorkspaceTrpcUrl(serverUrl),
+        url: trpcEndpoint(serverUrl),
         fetch: createNoRedirectFetch(options.fetch),
         headers: () => ({ authorization: `Bearer ${token}` })
       })

package/dist/transport.d.ts

@@ -1,2 +1,9 @@
 export declare function normalizeServerUrl(value: string): string;
+/**
+ * Resolve the tRPC endpoint relative to the server URL's path, so a base like
+ * `https://host/api` (path-routing proxy) maps to `https://host/api/trpc`.
+ */
+export declare function trpcEndpoint(serverUrl: string): string;
+/** Resolve a server `/api/*` route, adding `/api` only when the base doesn't already end in it. */
+export declare function apiEndpoint(serverUrl: string, route: string): string;
 export declare function createNoRedirectFetch(fetchImpl?: typeof fetch): typeof fetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitterm/sdk",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "files": [
     "dist"
   ],
@@ -25,14 +25,13 @@
     "access": "public"
   },
   "scripts": {
-    "build": "rm -rf dist && bun build src/index.ts src/direct/index.ts --outdir dist --target node --format esm --external @trpc/client --external eventsource --external @opencode-ai/sdk --external @opencode-ai/sdk/v2 --external e2b --external @asciidev/box-sdk --external @daytonaio/sdk --external @vercel/sandbox && tsc -p tsconfig.build.json",
+    "build": "rm -rf dist && bun build src/index.ts src/direct/index.ts --outdir dist --target node --format esm --external @trpc/client --external eventsource --external e2b --external @asciidev/box-sdk --external @daytonaio/sdk --external @vercel/sandbox && tsc -p tsconfig.build.json",
     "prepublishOnly": "bun run check-types && bun run build",
     "check-types": "tsc --noEmit"
   },
   "dependencies": {
     "@asciidev/box-sdk": "^0.0.34",
     "@daytonaio/sdk": "^0.207.0",
-    "@opencode-ai/sdk": "^1.18.25",
     "@trpc/client": "^11.8.1",
     "@vercel/sandbox": "^3.2.1",
     "e2b": "^2.46.1",
@@ -41,6 +40,7 @@
   "devDependencies": {
     "@gitterm/agent-runtime": "workspace:*",
     "@gitterm/api": "workspace:*",
+    "@opencode/client": "^2.0.19",
     "@trpc/server": "catalog:",
     "@types/bun": "^1.2.6",
     "typescript": "^5.8.2"