@@ -34,9 +34,7 @@ import { isWindowsCommandNotFound } from "../processRunner.ts";
3434import { collectStreamAsString } from "./providerSnapshot.ts" ;
3535import {
3636 EMPTY_PROVIDER_COMMAND_CATALOG ,
37- mapAcpAvailableCommandsToProviderCatalog ,
3837 mapOpenCodeSdkCatalogToProviderCatalog ,
39- providerCommandCatalogIsEmpty ,
4038 type ProviderCommandCatalog ,
4139} from "./providerCommandCatalog.ts" ;
4240import * as NetService from "@t3tools/shared/Net" ;
@@ -171,9 +169,8 @@ export interface OpenCodeRuntimeShape {
171169 readonly environment ?: NodeJS . ProcessEnv ;
172170 } ) => Effect . Effect < OpenCodeInventory , OpenCodeRuntimeError > ;
173171 /**
174- * Load slash/skill catalogs when the primary inventory left them empty.
175- * Order: B (SDK via serve/server URL) → A (`opencode acp` available_commands).
176- * Filesystem discovery (C) is handled by the provider layer.
172+ * Load slash/skill catalogs via the OpenCode SDK (`/command` + `/skill`).
173+ * Spawns a short-lived local serve when `serverUrl` is absent.
177174 */
178175 readonly loadProviderCommandCatalog : ( input : {
179176 readonly binaryPath : string ;
@@ -799,8 +796,7 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
799796 }
800797
801798 // CLI inventory does not expose commands/skills; callers that need a
802- // catalog should open an SDK session (server URL or local serve) and use
803- // loadOpenCodeInventory, or fall back to ACP / filesystem discovery.
799+ // catalog open an SDK session via loadProviderCommandCatalog.
804800 return {
805801 providerList : { all : allProviders , default : { } , connected } ,
806802 agents,
@@ -809,166 +805,26 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
809805 } ;
810806 } ) ;
811807
812- const loadProviderCommandCatalogViaSdk = ( input : {
813- readonly binaryPath : string ;
814- readonly directory : string ;
815- readonly environment ?: NodeJS . ProcessEnv ;
816- readonly serverUrl ?: string | null ;
817- readonly serverPassword ?: string ;
818- } ) : Effect . Effect < ProviderCommandCatalog , OpenCodeRuntimeError , Scope . Scope > =>
819- Effect . gen ( function * ( ) {
820- const server = yield * connectToOpenCodeServer ( {
821- binaryPath : input . binaryPath ,
822- serverUrl : input . serverUrl ,
823- environment : input . environment ,
824- } ) ;
825- const client = createOpenCodeSdkClient ( {
826- baseUrl : server . url ,
827- directory : input . directory ,
828- ...( input . serverPassword ? { serverPassword : input . serverPassword } : { } ) ,
829- } ) ;
830- const inventory = yield * loadOpenCodeInventory ( client ) ;
831- return mapOpenCodeSdkCatalogToProviderCatalog ( {
832- commands : inventory . commands ,
833- skills : inventory . skills ,
834- } ) ;
835- } ) ;
836-
837- const loadProviderCommandCatalogViaAcp = ( input : {
838- readonly binaryPath : string ;
839- readonly directory : string ;
840- readonly environment ?: NodeJS . ProcessEnv ;
841- } ) : Effect . Effect < ProviderCommandCatalog , OpenCodeRuntimeError , Scope . Scope > =>
842- Effect . gen ( function * ( ) {
843- const env = input . environment ?? process . env ;
844- const spawnCommand = yield * resolveCommand ( input . binaryPath || "opencode" , [ "acp" ] , env ) ;
845- const handle = yield * spawner
846- . spawn (
847- ChildProcess . make ( spawnCommand . command , spawnCommand . args , {
848- cwd : input . directory ,
849- env,
850- shell : spawnCommand . shell ,
851- } ) ,
852- )
853- . pipe (
854- Effect . mapError (
855- ( cause ) =>
856- new OpenCodeRuntimeError ( {
857- operation : "loadProviderCommandCatalogViaAcp" ,
858- detail : openCodeRuntimeErrorDetail ( cause ) ,
859- cause,
860- } ) ,
861- ) ,
862- ) ;
863-
864- const encoder = new TextEncoder ( ) ;
865- const writeLine = ( message : unknown ) =>
866- handle . stdin . write ( encoder . encode ( `${ JSON . stringify ( message ) } \n` ) ) . pipe (
867- Effect . mapError (
868- ( cause ) =>
869- new OpenCodeRuntimeError ( {
870- operation : "loadProviderCommandCatalogViaAcp" ,
871- detail : "Failed to write ACP request." ,
872- cause,
873- } ) ,
874- ) ,
875- Effect . asVoid ,
876- ) ;
877-
878- yield * writeLine ( {
879- jsonrpc : "2.0" ,
880- id : 1 ,
881- method : "initialize" ,
882- params : {
883- protocolVersion : 1 ,
884- clientCapabilities : { } ,
885- clientInfo : { name : "t3-code-opencode-catalog" , version : "0.0.0" } ,
886- } ,
887- } ) ;
888- yield * writeLine ( {
889- jsonrpc : "2.0" ,
890- id : 2 ,
891- method : "session/new" ,
892- params : { cwd : input . directory , mcpServers : [ ] } ,
893- } ) ;
894-
895- let buffer = "" ;
896- type AcpCommand = {
897- readonly name : string ;
898- readonly description ?: string ;
899- readonly input ?: { readonly hint ?: string } | null ;
900- readonly _meta ?: { readonly [ x : string ] : unknown } | null ;
901- } ;
902- const found = yield * Deferred . make < ReadonlyArray < AcpCommand > > ( ) ;
903- let availableCommands : ReadonlyArray < AcpCommand > = [ ] ;
904-
905- const reader = yield * handle . stdout . pipe (
906- Stream . decodeText ( ) ,
907- Stream . runForEach ( ( chunk ) =>
908- Effect . gen ( function * ( ) {
909- buffer += chunk ;
910- const lines = buffer . split ( "\n" ) ;
911- buffer = lines . pop ( ) ?? "" ;
912- for ( const line of lines ) {
913- const trimmed = line . trim ( ) ;
914- if ( ! trimmed ) continue ;
915- try {
916- const message = JSON . parse ( trimmed ) as {
917- readonly method ?: string ;
918- readonly params ?: {
919- readonly update ?: {
920- readonly sessionUpdate ?: string ;
921- readonly availableCommands ?: ReadonlyArray < AcpCommand > ;
922- } ;
923- } ;
924- } ;
925- if (
926- message . method === "session/update" &&
927- message . params ?. update ?. sessionUpdate === "available_commands_update" &&
928- Array . isArray ( message . params . update . availableCommands ) &&
929- message . params . update . availableCommands . length > 0
930- ) {
931- availableCommands = message . params . update . availableCommands ;
932- yield * Deferred . succeed ( found , availableCommands ) . pipe ( Effect . ignore ) ;
933- }
934- } catch {
935- // ignore non-JSON chatter
936- }
937- }
938- } ) ,
939- ) ,
940- Effect . forkScoped ,
941- ) ;
942-
943- const commands = yield * Deferred . await ( found ) . pipe (
944- Effect . timeoutOption ( 8_000 ) ,
945- Effect . map ( ( option ) => ( Option . isSome ( option ) ? option . value : availableCommands ) ) ,
946- Effect . ensuring (
947- Effect . all ( [ Fiber . interrupt ( reader ) , handle . kill ( ) ] , { concurrency : "unbounded" } ) . pipe (
948- Effect . ignore ,
949- ) ,
950- ) ,
951- ) ;
952-
953- return mapAcpAvailableCommandsToProviderCatalog ( commands ) ;
954- } ) ;
955-
956808 const loadProviderCommandCatalog : OpenCodeRuntimeShape [ "loadProviderCommandCatalog" ] = ( input ) =>
957809 Effect . scoped (
958810 Effect . gen ( function * ( ) {
959- // B — SDK
960- const fromSdk = yield * loadProviderCommandCatalogViaSdk ( input ) . pipe (
961- Effect . orElseSucceed ( ( ) => EMPTY_PROVIDER_COMMAND_CATALOG ) ,
962- ) ;
963- if ( ! providerCommandCatalogIsEmpty ( fromSdk ) ) {
964- return fromSdk ;
965- }
966- // A — ACP
967- return yield * loadProviderCommandCatalogViaAcp ( input ) . pipe (
968- Effect . orElseSucceed ( ( ) => EMPTY_PROVIDER_COMMAND_CATALOG ) ,
969- ) ;
811+ const server = yield * connectToOpenCodeServer ( {
812+ binaryPath : input . binaryPath ,
813+ serverUrl : input . serverUrl ,
814+ environment : input . environment ,
815+ } ) ;
816+ const client = createOpenCodeSdkClient ( {
817+ baseUrl : server . url ,
818+ directory : input . directory ,
819+ ...( input . serverPassword ? { serverPassword : input . serverPassword } : { } ) ,
820+ } ) ;
821+ const inventory = yield * loadOpenCodeInventory ( client ) ;
822+ return mapOpenCodeSdkCatalogToProviderCatalog ( {
823+ commands : inventory . commands ,
824+ skills : inventory . skills ,
825+ } ) ;
970826 } ) ,
971- ) ;
827+ ) . pipe ( Effect . orElseSucceed ( ( ) => EMPTY_PROVIDER_COMMAND_CATALOG ) ) ;
972828
973829 return {
974830 startOpenCodeServerProcess,
0 commit comments