@mawaru/sdk 0.11.0 → 0.14.1

package/_schemas/port-spec.test.ts

@@ -3,12 +3,9 @@ import type { GraphPort, JsonSchema } from "./node.js"
 import {
   dataFormatOf,
   dataSchemaOf,
-  envelopeDataSchemaOf,
-  envelopeSchemaOf,
   fileSchema,
   hasInboundConflict,
   instructionSchema,
-  isAiEnvelopeSchema,
   isFileSchema,
   isSchemaSubset,
   kindPortsViolation,
@@ -77,102 +74,19 @@ describe("データフォーマットカタログ（S）", () => {
   })
 })
 
-describe("封筒型 { data: T, description: string }", () => {
-  it("envelopeSchemaOf：任意の data スキーマを包み、data / description とも必須", () => {
-    const text = envelopeSchemaOf({ type: "string" })
-    expect(text).toEqual({
-      type: "object",
-      properties: {
-        data: { type: "string" },
-        description: { type: "string" },
-      },
-      required: ["data", "description"],
-    })
-    // カタログ外の任意型も包める
-    const custom = {
-      type: "object",
-      properties: { title: { type: "string" }, count: { type: "number" } },
-      required: ["title"],
-    }
-    expect(envelopeSchemaOf(custom).properties).toMatchObject({ data: custom })
-  })
-
-  it("envelopeDataSchemaOf：封筒型なら data のサブスキーマ、そうでなければ null", () => {
-    const dataSchema = { type: "array", items: { type: "string" } }
-    expect(envelopeDataSchemaOf(envelopeSchemaOf(dataSchema))).toEqual(
-      dataSchema,
-    )
-    // data キーが無い / optional / object でない
-    expect(envelopeDataSchemaOf({ type: "object", properties: {} })).toBeNull()
+describe("kindPortsViolation（kind 別ポート構成）", () => {
+  it("ai は in / out とも key 自由（構成の固定なし。口数は graph 側が見る）", () => {
     expect(
-      envelopeDataSchemaOf({
-        type: "object",
-        properties: { data: { type: "string" } },
-      }),
+      kindPortsViolation("ai", [port("in", "in"), port("out", "main")]),
     ).toBeNull()
-    expect(envelopeDataSchemaOf({ type: "string" })).toBeNull()
-    expect(envelopeDataSchemaOf(UNDECLARED_SCHEMA)).toBeNull()
-  })
-
-  it("isAiEnvelopeSchema：data と description: string の両方が必須のときだけ true", () => {
-    expect(isAiEnvelopeSchema(envelopeSchemaOf({ type: "string" }))).toBe(true)
-    expect(isAiEnvelopeSchema(envelopeSchemaOf({ type: "object" }))).toBe(true)
-    // description が無い / optional / string でない
-    expect(
-      isAiEnvelopeSchema({
-        type: "object",
-        properties: { data: { type: "string" } },
-        required: ["data"],
-      }),
-    ).toBe(false)
-    expect(
-      isAiEnvelopeSchema({
-        type: "object",
-        properties: {
-          data: { type: "string" },
-          description: { type: "string" },
-        },
-        required: ["data"],
-      }),
-    ).toBe(false)
-    expect(
-      isAiEnvelopeSchema({
-        type: "object",
-        properties: {
-          data: { type: "string" },
-          description: { type: "number" },
-        },
-        required: ["data", "description"],
-      }),
-    ).toBe(false)
-    expect(isAiEnvelopeSchema(UNDECLARED_SCHEMA)).toBe(false)
-  })
-})
-
-describe("kindPortsViolation（kind 別ポート構成）", () => {
-  it("ai は out の key 自由・複数可。in は in / instruction の2口固定（AI の複数出口）", () => {
-    const ins = [port("in", "in"), port("in", "instruction")]
-    expect(kindPortsViolation("ai", [...ins, port("out", "main")])).toBeNull()
-    expect(kindPortsViolation("ai", [...ins, port("out", "draft")])).toBeNull()
     expect(
       kindPortsViolation("ai", [
-        ...ins,
+        port("in", "task"),
+        port("in", "feedback"),
         port("out", "spam"),
         port("out", "sales"),
-        port("out", "support"),
       ]),
     ).toBeNull()
-    // instruction が無い・key が違うのは違反
-    expect(
-      kindPortsViolation("ai", [port("in", "in"), port("out", "main")]),
-    ).toMatch(/instruction/)
-    expect(
-      kindPortsViolation("ai", [
-        port("in", "input"),
-        port("in", "instruction"),
-        port("out", "main"),
-      ]),
-    ).toMatch(/ai/)
   })
 
   it("human は in / approve / reject 固定", () => {
@@ -217,10 +131,18 @@ describe("kindPortsViolation（kind 別ポート構成）", () => {
 })
 
 describe("型伝播（導出ポートの解決）", () => {
-  const envelope = envelopeSchemaOf({ type: "string" })
+  // 伝播テスト用の任意の宣言型（中身の形に意味はない）
+  const declaredOut = {
+    type: "object",
+    properties: { text: { type: "string" } },
+    required: ["text"],
+  }
 
-  it("ai → human 直結：approve は封筒を剥がした data 型、reject は指示エンベロープ", () => {
-    const aiOut = port("out", "main", envelope)
+  // human の in / approve / reject はビューの宣言をそのまま転写する（上流の kind は見ない）。
+  // sdk はカタログを知らないので、呼び出し元が viewPortSchemasOf で解決して渡す
+  // → docs/tasks/wip/ポート型固定の撤去とセッション再開のポート属性化.md
+  it("ai → human 直結（コピー宣言）：in も approve も上流の out と同型、reject はビューの宣言型", () => {
+    const aiOut = port("out", "main", declaredOut)
     const ai = {
       id: uuid(),
       kind: "ai",
@@ -237,13 +159,144 @@ describe("型伝播（導出ポートの解決）", () => {
     const resolved = resolvePortSchemas(
       [ai, human],
       [{ from_port_id: aiOut.id, to_port_id: humanIn.id }],
+      {
+        viewPortSchemasOf: () => ({
+          in: "T",
+          approve: "T",
+          reject: instructionSchema(),
+        }),
+      },
     )
-    expect(resolved.get(humanIn.id)).toEqual(envelope)
-    expect(resolved.get(approve.id)).toEqual({ type: "string" })
+    // 上流が AI でも中身を取り出さない：AI の出力形式がそのまま下流へ流れる
+    expect(resolved.get(humanIn.id)).toEqual(declaredOut)
+    expect(resolved.get(approve.id)).toEqual(declaredOut)
     expect(resolved.get(reject.id)).toEqual(instructionSchema())
   })
 
-  it("ai → wait → human：素通しで封筒型が伝播し、reject は指示エンベロープのまま", () => {
+  describe("承認ビューの宣言を human のポートへ転写する", () => {
+    const viewIn = {
+      type: "object",
+      properties: {
+        data: {
+          type: "object",
+          properties: { prs: { type: "array", items: { type: "object" } } },
+          required: ["prs"],
+        },
+        description: { type: "string" },
+      },
+      required: ["data", "description"],
+    }
+    const viewOut = {
+      type: "object",
+      properties: { prs: { type: "array", items: { type: "object" } } },
+      required: ["prs"],
+    }
+    // reject もビューの宣言（具体型のみ。コピー指示は意味を持たない）
+    const viewReject = {
+      type: "object",
+      properties: { reason: { type: "string" } },
+      required: ["reason"],
+    }
+    const build = (upstreamKind: string, upstreamOut: JsonSchema) => {
+      const out = port("out", "main", upstreamOut)
+      const upstream = {
+        id: uuid(),
+        kind: upstreamKind,
+        ports: [port("in", "in"), out],
+      }
+      const humanIn = port("in", "in")
+      const approve = port("out", "approve")
+      const reject = port("out", "reject")
+      const human = {
+        id: uuid(),
+        kind: "human",
+        ports: [humanIn, approve, reject],
+      }
+      return { upstream, human, out, humanIn, approve, reject }
+    }
+
+    it("宣言のあるビューは上流の kind に依らず同じ型になる", () => {
+      for (const kind of ["ai", "program"]) {
+        const { upstream, human, out, humanIn, approve, reject } = build(
+          kind,
+          declaredOut,
+        )
+        const resolved = resolvePortSchemas(
+          [upstream, human],
+          [{ from_port_id: out.id, to_port_id: humanIn.id }],
+          {
+            viewPortSchemasOf: () => ({
+              in: viewIn,
+              approve: viewOut,
+              reject: viewReject,
+            }),
+          },
+        )
+        expect(resolved.get(humanIn.id)).toEqual(viewIn)
+        expect(resolved.get(approve.id)).toEqual(viewOut)
+        expect(resolved.get(reject.id)).toEqual(viewReject)
+      }
+    })
+
+    it("上流の out は書き換えない（逆伝播しない）", () => {
+      const { upstream, human, out, humanIn } = build("ai", declaredOut)
+      const resolved = resolvePortSchemas(
+        [upstream, human],
+        [{ from_port_id: out.id, to_port_id: humanIn.id }],
+        {
+          viewPortSchemasOf: () => ({
+            in: viewIn,
+            approve: viewOut,
+            reject: viewReject,
+          }),
+        },
+      )
+      expect(resolved.get(out.id)).toEqual(declaredOut)
+    })
+
+    it("コピー宣言（標準ビュー）は上流の型をそのまま in と approve へ流す", () => {
+      const { upstream, human, out, humanIn, approve } = build(
+        "ai",
+        declaredOut,
+      )
+      const resolved = resolvePortSchemas(
+        [upstream, human],
+        [{ from_port_id: out.id, to_port_id: humanIn.id }],
+        {
+          viewPortSchemasOf: () => ({
+            in: "T",
+            approve: "T",
+            reject: viewReject,
+          }),
+        },
+      )
+      expect(resolved.get(humanIn.id)).toEqual(declaredOut)
+      expect(resolved.get(approve.id)).toEqual(declaredOut)
+    })
+
+    it("未接続でも宣言で固定される", () => {
+      const humanIn = port("in", "in")
+      const approve = port("out", "approve")
+      const reject = port("out", "reject")
+      const human = {
+        id: uuid(),
+        kind: "human",
+        ports: [humanIn, approve, reject],
+      }
+      const resolved = resolvePortSchemas([human], [], {
+        viewPortSchemasOf: () => ({
+          in: viewIn,
+          approve: viewOut,
+          reject: viewReject,
+        }),
+      })
+      expect(resolved.get(humanIn.id)).toEqual(viewIn)
+      expect(resolved.get(approve.id)).toEqual(viewOut)
+      expect(resolved.get(reject.id)).toEqual(viewReject)
+    })
+  })
+
+  it("ai → wait → human：素通しで上流の宣言型が伝播し、reject はビュー宣言が無ければ未宣言", () => {
     // ai の in は宣言型（nodes/ai/<dir>/config.json の inputs.in 由来。実行repoの構造見直し）
     const aiInSchema = {
       type: "object",
@@ -251,7 +304,7 @@ describe("型伝播（導出ポートの解決）", () => {
       required: ["inquiry"],
     }
     const aiIn = port("in", "in", aiInSchema)
-    const aiOut = port("out", "main", envelope)
+    const aiOut = port("out", "main", declaredOut)
     const waitIn = port("in", "in")
     const waitOut = port("out", "main")
     const humanIn = port("in", "in")
@@ -273,16 +326,41 @@ describe("型伝播（導出ポートの解決）", () => {
       { from_port_id: waitOut.id, to_port_id: humanIn.id },
     ]
     const resolved = resolvePortSchemas([ai, wait, human], conns)
-    expect(resolved.get(waitIn.id)).toEqual(envelope)
-    expect(resolved.get(waitOut.id)).toEqual(envelope)
-    expect(resolved.get(humanIn.id)).toEqual(envelope)
-    // 封筒剥がしは「in の直接の接続元が AI ノード」のときだけ。wait 越しは素通し
-    expect(resolved.get(approve.id)).toEqual(envelope)
-    expect(resolved.get(reject.id)).toEqual(instructionSchema())
+    expect(resolved.get(waitIn.id)).toEqual(declaredOut)
+    expect(resolved.get(waitOut.id)).toEqual(declaredOut)
+    expect(resolved.get(humanIn.id)).toEqual(declaredOut)
+    // approve は in と同型（上流の kind による中身の取り出しはしない）
+    expect(resolved.get(approve.id)).toEqual(declaredOut)
+    // reject はビューの宣言でのみ決まる（sdk 単体＝カタログ無しでは未宣言。型固定は廃止）
+    expect(resolved.get(reject.id)).toEqual(UNDECLARED_SCHEMA)
     // ai の in は宣言型がそのまま残る（const 扱いは廃止）
     expect(resolved.get(aiIn.id)).toEqual(aiInSchema)
   })
 
+  it("ai の in はどの口も接続鏡映される（instruction の特別扱い＝型固定は廃止）", () => {
+    const progOut = port("out", "main", declaredOut)
+    const program = {
+      id: uuid(),
+      kind: "program",
+      ports: [port("in", "in"), progOut],
+    }
+    // 宣言はデフォルトの指示型。接続すると接続元の型に同期される（他の in と同じ）
+    const instruction = port("in", "instruction", instructionSchema())
+    const ai = {
+      id: uuid(),
+      kind: "ai",
+      ports: [port("in", "in"), instruction, port("out", "main")],
+    }
+    const resolved = resolvePortSchemas(
+      [program, ai],
+      [{ from_port_id: progOut.id, to_port_id: instruction.id }],
+    )
+    expect(resolved.get(instruction.id)).toEqual(declaredOut)
+    // 未接続なら宣言（デフォルト型）を維持する
+    const kept = resolvePortSchemas([ai], [])
+    expect(kept.get(instruction.id)).toEqual(instructionSchema())
+  })
+
   it("未接続の導出ポート・純パラメトリック閉路は any", () => {
     const in1 = port("in", "in")
     const out1 = port("out", "main")
@@ -308,7 +386,7 @@ describe("型伝播（導出ポートの解決）", () => {
       properties: { inquiry: { type: "string" } },
       required: ["inquiry"],
     }
-    const aiOut = port("out", "main", envelope)
+    const aiOut = port("out", "main", declaredOut)
     const ai = {
       id: uuid(),
       kind: "ai",
@@ -324,7 +402,7 @@ describe("型伝播（導出ポートの解決）", () => {
       [ai, program],
       [{ from_port_id: aiOut.id, to_port_id: progIn.id }],
     )
-    expect(resolved.get(progIn.id)).toEqual(envelope)
+    expect(resolved.get(progIn.id)).toEqual(declaredOut)
   })
 
   it("ai の in も接続鏡映（sticky）：具体型の接続元だけ上書きする", () => {
@@ -332,7 +410,7 @@ describe("型伝播（導出ポートの解決）", () => {
       type: "object",
       properties: { topic: { type: "string" } },
     }
-    const progOut = port("out", "main", envelope)
+    const progOut = port("out", "main", declaredOut)
     const program = {
       id: uuid(),
       kind: "program",
@@ -349,7 +427,7 @@ describe("型伝播（導出ポートの解決）", () => {
       [program, ai],
       [{ from_port_id: progOut.id, to_port_id: aiIn.id }],
     )
-    expect(resolved.get(aiIn.id)).toEqual(envelope)
+    expect(resolved.get(aiIn.id)).toEqual(declaredOut)
     // 接続元が any（源泉の無い wait）→ 宣言を維持
     const waitOut = port("out", "main")
     const wait = {
@@ -401,7 +479,7 @@ describe("型伝播（導出ポートの解決）", () => {
   })
 
   it("program の in：wait 越しでも具体型が鏡映される（固定点反復）", () => {
-    const aiOut = port("out", "main", envelope)
+    const aiOut = port("out", "main", declaredOut)
     const ai = {
       id: uuid(),
       kind: "ai",
@@ -423,7 +501,7 @@ describe("型伝播（導出ポートの解決）", () => {
         { from_port_id: waitOut.id, to_port_id: progIn.id },
       ],
     )
-    expect(resolved.get(progIn.id)).toEqual(envelope)
+    expect(resolved.get(progIn.id)).toEqual(declaredOut)
   })
 
   // start の run 入力契約は接続先から導出する
@@ -534,7 +612,7 @@ describe("型伝播（導出ポートの解決）", () => {
   })
 
   it("propagateDerivedPorts：schema を書き戻し、変化のないノードは同じ参照を返す", () => {
-    const progOut = port("out", "main", envelope)
+    const progOut = port("out", "main", declaredOut)
     const program = {
       id: uuid(),
       kind: "program",
@@ -551,7 +629,10 @@ describe("型伝播（導出ポートの解決）", () => {
       [{ from_port_id: progOut.id, to_port_id: waitIn.id }],
     )
     expect(next[0]).toBe(program) // 宣言のみ＝無変更
-    expect(next[1]?.ports.map((p) => p.schema)).toEqual([envelope, envelope])
+    expect(next[1]?.ports.map((p) => p.schema)).toEqual([
+      declaredOut,
+      declaredOut,
+    ])
     // 接続を消すと any に戻る
     const cleared = propagateDerivedPorts(next, [])
     expect(cleared[1]?.ports.map((p) => p.schema)).toEqual([
@@ -562,7 +643,7 @@ describe("型伝播（導出ポートの解決）", () => {
 
   it("propagateDerivedPorts：side / offset（表示位置）を落とさない", () => {
     const progOut = {
-      ...port("out", "main", envelope),
+      ...port("out", "main", declaredOut),
       side: "top" as const,
       offset: 0.3,
     }