@capyclaw/foundation 0.1.2 → 0.1.3

package/lib/adapters/http-router.mjs

@@ -5,6 +5,7 @@
  * 应用侧不接触 server、不选端口。
  */
 import { AbiError, ERROR_CODES } from '../../abi/errors.mjs'
+import { getService } from '../ctx-service.mjs'
 
 export const kind = 'http-router@1'
 
@@ -12,12 +13,13 @@ export function createHttpRouterAdapter({ ctx, net, log }) {
   return {
     kind,
     compile(impl, { spec, config }) {
-      if (!ctx?.serviceHost?.createApp) {
+      const serviceHost = getService(ctx, 'serviceHost')
+      if (!serviceHost?.createApp) {
         throw new AbiError(ERROR_CODES.E_CAP_MISSING,
           'ctx.serviceHost 不可用：无法创建子 app', { plugin: spec.name, capability: 'os.net' })
       }
 
-      const app = ctx.serviceHost.createApp({ id: spec.name, title: spec.name })
+      const app = serviceHost.createApp({ id: spec.name, title: spec.name })
       try {
         impl.routes(app, { spec, config, log })
       } catch (error) {

package/lib/adapters/runtime-driver.mjs

@@ -7,6 +7,7 @@
 import { fileURLToPath } from 'node:url'
 
 import { AbiError, ERROR_CODES } from '../../abi/errors.mjs'
+import { getService } from '../ctx-service.mjs'
 
 export const kind = 'runtime-driver@1'
 
@@ -16,7 +17,8 @@ export function createRuntimeDriverAdapter({ ctx, config, log }) {
   return {
     kind,
     compile(impl, mountContext) {
-      if (!ctx?.serviceBroker?.start || !ctx?.serviceBroker?.stop) {
+      const broker = getService(ctx, 'serviceBroker')
+      if (!broker?.start || !broker?.stop) {
         throw new AbiError(ERROR_CODES.E_CAP_MISSING,
           'ctx.serviceBroker 不可用：无法拉起长驻进程',
           { plugin: mountContext.spec.name, capability: 'os.proc' })
@@ -56,7 +58,7 @@ export function createRuntimeDriverAdapter({ ctx, config, log }) {
       return {
         serviceSpec,
         async start() {
-          const result = await ctx.serviceBroker.start(serviceSpec)
+          const result = await broker.start(serviceSpec)
           const failure = (result?.errors || []).find((item) => item.id === impl.id)
           if (failure) {
             throw new AbiError(ERROR_CODES.E_ADAPTER_THREW,
@@ -68,7 +70,7 @@ export function createRuntimeDriverAdapter({ ctx, config, log }) {
           if (stopped) return
           stopped = true
           try {
-            ctx.serviceBroker.stop(impl.id)
+            broker.stop(impl.id)
           } catch (error) {
             log?.warn?.(`[foundation] 停止 ${impl.id} 失败: ${error.message}`)
           }

package/lib/adapters/skill-provider.mjs

@@ -9,6 +9,7 @@ import { basename, dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import { AbiError, ERROR_CODES } from '../../abi/errors.mjs'
+import { getService } from '../ctx-service.mjs'
 import { createSkillProvider } from '../skill/scan.mjs'
 
 export const kind = 'skill-provider@1'
@@ -17,7 +18,7 @@ export function createSkillAdapter({ ctx, log }) {
   return {
     kind,
     compile(impl, { spec, context }) {
-      const skills = ctx?.skills
+      const skills = getService(ctx, 'skills')
       if (!skills || typeof skills.registerProvider !== 'function') {
         throw new AbiError(ERROR_CODES.E_CAP_MISSING,
           'ctx.skills.registerProvider 不可用：skills 服务未加载', { plugin: spec.name })

package/lib/adapters/tool-provider.mjs

@@ -7,6 +7,7 @@
  * 工具实现不经过 foundation，foundation 只决定「什么时候挂上去、挂到哪个命名空间」。
  */
 import { AbiError, ERROR_CODES } from '../../abi/errors.mjs'
+import { getService } from '../ctx-service.mjs'
 
 export const kind = 'tool-provider@1'
 
@@ -14,7 +15,8 @@ export function createToolProviderAdapter({ ctx, log }) {
   return {
     kind,
     compile(impl, { spec, config }) {
-      if (!ctx?.toolHost?.registerWithDsh) {
+      const toolHost = getService(ctx, 'toolHost')
+      if (!toolHost?.registerWithDsh) {
         throw new AbiError(ERROR_CODES.E_CAP_MISSING,
           'ctx.toolHost 不可用：无法注册工具面', { plugin: spec.name, capability: 'os.tools' })
       }
@@ -31,7 +33,7 @@ export function createToolProviderAdapter({ ctx, log }) {
           'provide() 必须返回 { TOOLS, TOOL_IMPL } 形状的注册表', { plugin: spec.name })
       }
 
-      const dispose = ctx.toolHost.registerWithDsh(ctx, registry, { namespace: impl.namespace })
+      const dispose = toolHost.registerWithDsh(ctx, registry, { namespace: impl.namespace })
       log?.debug?.(`[foundation] ${spec.name} 注册 ${registry.TOOLS.length} 个工具（${impl.namespace}）`)
       return {
         registry,

package/lib/adapters/ui-panel.mjs

@@ -6,6 +6,7 @@
 import { fileURLToPath } from 'node:url'
 
 import { AbiError, ERROR_CODES } from '../../abi/errors.mjs'
+import { getService } from '../ctx-service.mjs'
 
 export const kind = 'ui-panel@1'
 
@@ -13,7 +14,9 @@ export function createUiPanelAdapter({ ctx, net, log }) {
   return {
     kind,
     compile(impl, { spec, config, context }) {
-      if (!ctx?.serviceHost?.createApp || !ctx?.editorHost?.createEditorHost) {
+      const serviceHost = getService(ctx, 'serviceHost')
+      const editorHost = getService(ctx, 'editorHost')
+      if (!serviceHost?.createApp || !editorHost?.createEditorHost) {
         throw new AbiError(ERROR_CODES.E_CAP_MISSING,
           'ctx.editorHost / ctx.serviceHost 不可用：无法挂静态面板',
           { plugin: spec.name, capability: 'os.ui' })
@@ -24,14 +27,14 @@ export function createUiPanelAdapter({ ctx, net, log }) {
       }
 
       const dir = fileURLToPath(new URL(impl.root, context.baseUrl))
-      const editor = ctx.editorHost.createEditorHost({
+      const editor = editorHost.createEditorHost({
         id: spec.name,
         dir,
         basePath: impl.mount,
         index: impl.index,
       })
 
-      const app = ctx.serviceHost.createApp({ id: spec.name, title: spec.name })
+      const app = serviceHost.createApp({ id: spec.name, title: spec.name })
       for (const route of editor.routes()) app.use(route)
 
       let unmount

package/lib/ctx-service.mjs

@@ -0,0 +1,21 @@
+/**
+ * 服务探测：Cordis 的 ctx 是 Proxy，读取未在 `inject` 声明的服务会直接抛
+ * `cannot get property "x" without inject`。内核需要在 apply 时探测「哪些服务在场」，
+ * 因此统一走 `ctx.get(name)`（Cordis 官方 API：读取服务但不要求 inject，未提供返回 undefined）。
+ *
+ * 纯对象 ctx（测试、宿主）没有 get()，退化为直接属性访问；两种情况都不抛。
+ */
+export function getService(ctx, name) {
+  if (!ctx) return undefined
+  if (typeof ctx.get === 'function') {
+    try {
+      const service = ctx.get(name)
+      if (service !== undefined) return service
+    } catch { /* 继续尝试属性访问 */ }
+  }
+  try {
+    return ctx[name]
+  } catch {
+    return undefined
+  }
+}

package/lib/kernel.mjs

@@ -8,6 +8,7 @@
  */
 import { ABI_MAJOR } from '../abi/kinds.mjs'
 import { createLoader } from '../abi/loader.mjs'
+import { getService } from './ctx-service.mjs'
 import { createSkillAdapter } from './adapters/skill-provider.mjs'
 import { createToolProviderAdapter } from './adapters/tool-provider.mjs'
 import { createRuntimeDriverAdapter } from './adapters/runtime-driver.mjs'
@@ -28,11 +29,12 @@ export const BASE_CAPABILITIES = Object.freeze({
 /** 按 ctx 里实际存在的服务生成能力表。 */
 export function detectCapabilities(ctx) {
   const capabilities = { ...BASE_CAPABILITIES }
-  if (ctx?.skills?.registerProvider) capabilities['os.skills'] = '1.0.0'
-  if (ctx?.serviceHost?.createSharedHost && ctx?.serviceHost?.createApp) capabilities['os.net'] = '1.0.0'
-  if (ctx?.toolHost?.registerWithDsh) capabilities['os.tools'] = '1.0.0'
-  if (ctx?.serviceBroker?.start) capabilities['os.proc'] = '1.0.0'
-  if (ctx?.editorHost?.createEditorHost) capabilities['os.ui'] = '1.0.0'
+  if (getService(ctx, 'skills')?.registerProvider) capabilities['os.skills'] = '1.0.0'
+  const serviceHost = getService(ctx, 'serviceHost')
+  if (serviceHost?.createSharedHost && serviceHost?.createApp) capabilities['os.net'] = '1.0.0'
+  if (getService(ctx, 'toolHost')?.registerWithDsh) capabilities['os.tools'] = '1.0.0'
+  if (getService(ctx, 'serviceBroker')?.start) capabilities['os.proc'] = '1.0.0'
+  if (getService(ctx, 'editorHost')?.createEditorHost) capabilities['os.ui'] = '1.0.0'
   return capabilities
 }
 

package/lib/subsystems/log.mjs

@@ -2,7 +2,10 @@
  * 结构化日志：优先复用 dsh 的 ctx.logger，没有就退回 console。
  *
  * 插件不自己拼前缀，一律通过 log.child({ plugin }) 拿作用域。
+ * ctx 是 Cordis Proxy，未 inject 的服务直接读会抛错，这里用 getService 探测。
  */
+import { getService } from '../ctx-service.mjs'
+
 const LEVELS = ['debug', 'info', 'warn', 'error']
 
 function createScoped(underlying, scope) {
@@ -22,6 +25,6 @@ function createScoped(underlying, scope) {
 }
 
 export function createLogger(ctx, config = {}) {
-  const underlying = ctx?.logger
+  const underlying = getService(ctx, 'logger')
   return createScoped(underlying, config.scope || 'foundation')
 }

package/lib/subsystems/net.mjs

@@ -5,6 +5,7 @@
  * 只注册 skill 的插件不会因为装了 foundation 就占一个端口。
  */
 import { AbiError, ERROR_CODES } from '../../abi/errors.mjs'
+import { getService } from '../ctx-service.mjs'
 
 export function createNet(ctx, config = {}) {
   const http = config.http || {}
@@ -13,7 +14,7 @@ export function createNet(ctx, config = {}) {
   let closed = false
 
   function ensure() {
-    const serviceHost = ctx?.serviceHost
+    const serviceHost = getService(ctx, 'serviceHost')
     if (!serviceHost?.createSharedHost) {
       throw new AbiError(ERROR_CODES.E_CAP_MISSING,
         'ctx.serviceHost 不可用：无法挂载 HTTP 路由', { capability: 'os.net' })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capyclaw/foundation",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "dsh 插件基石层：接口 ABI、插件加载器与内核服务 ctx.os。应用插件只声明接口，不写装配代码。",
   "type": "module",
   "main": "./lib/host.mjs",