File size: 122,923 Bytes
4e23b01 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 | /**
* v2 wiring MVP β an `SDKRpcClientBase` backed by the agent-core-v2 engine
* (DI Γ Scope) instead of the v1 `KimiCore` RPC pair. The engine is
* bootstrapped in-process and reached through the klient facade over the
* memory transport, so every call crosses the same contract validation and
* JSON round-trip as the networked transports.
*
* Migrated so far:
* - `getExperimentalFeatures` β `klient.global.flags.list()`
* - `listWorkspaceSkills` β not covered by the klient facade, so it goes
* through the `engineAccessor` escape hatch (the workspace handler's
* `IWorkspaceSkillCatalog`) instead.
* - `suggestFiles` β same escape hatch (the workspace handler's
* `IWorkspaceFsService`); the v1 client inherits the base's `undefined`
* (capability absent).
* - `getConfig` / `setConfig` / `removeProvider` / `getConfigDiagnostics` β
* `klient.global.config.*`, with the v1 `KimiConfig` shape restored by the
* pure mapping layer in `src/v2/config-mapper.ts`.
* - `listPlugins` / `installPlugin` / `setPluginEnabled` /
* `setPluginMcpServerEnabled` / `removePlugin` / `reloadPlugins` /
* `getPluginInfo` / `listPluginCommands` β `klient.global.plugins.*`. The
* wire types are field-identical between the engines, so no mapping layer
* is needed. Unlike the config domain, the v2 plugin service serializes
* every read behind its own initial load, so there is no ready trap here.
* - `listSessions` / `createSession` / `renameSession` / `forkSession` /
* `closeSession` / `resumeSession` / `reloadSession` / `deleteSession` /
* `updateSessionMetadata` / `addAdditionalDir` β the session lifecycle
* batch: `klient.global.sessions.list` plus the `klient.session(id)`
* metadata mutations where the facade reaches, and the
* `IWorkspaceLifecycleService` / handler chain / session-scope services through
* {@link engineAccessor} where it does not (explicit session ids, resume,
* fork ids, delete, the workspace-level add-dir surface). The v1 `SessionSummary` / `SessionMeta`
* shapes are restored by the pure mapping layer in
* `src/v2/session-mapper.ts`. The resumed results carry the full v1
* per-agent snapshot: the live slices are read from the restored agent
* scope (profile / permission / swarm services + the klient agent facade),
* while `replay` and `toolStore` are folded from each agent's `wire.jsonl`
* by the engine's `foldWireRecords`
* (`src/v2/resume-replay.ts`) β `includeSubagents` and `replayTurnLimit`
* included.
* - `setModel` / `setPermission` / `setPlanMode` / `getPlan` / `clearPlan` /
* `getContext` / `getUsage` / `listCommands` / `runCommand` β
* the `klient.session(id).agent(id)` facade; `cancel` β the same facade
* plus `ISessionInitService.cancelInit` (v1's cascade to the session-level
* /init run); `setThinking` / `compact` /
* `cancelCompaction` / `undoHistory` / `clearContext` / `importContext` β
* agent-scope services through the live
* session handle (no facade exists); `getStatus` β the same six-slice
* aggregate the base class builds, re-read from the profile / permission /
* swarm services plus the facade. `importContext` composes v1's exact
* message + rejections over v2 primitives (`src/v2/import-context.ts`) β
* the engine has no import capability of its own. `createSession`'s
* `model` / `thinking` / `permission` options are applied in this batch
* too (default-profile bind + permission mode).
* - `prompt` / `steer` / `runShellCommand` / `cancelShellCommand` β the
* `klient.session(id).agent(id)` facade; `activatePluginCommand` β
* `IAgentPluginCommandService` through the agent scope; `activateSkill` β
* the main agent's `IAgentSkillService` (the engine settles
* `{turn_id}` and applies v1's main-only metadata update itself);
* `generateAgentsMd` β
* `ISessionInitService` through the session scope; `getSessionWarnings` β
* rebuilt over the profile's cached AGENTS.md warning plus the engine's
* `prepareSystemPromptContext` (no v2 aggregate service exists).
* - `createGoal` / `getGoal` / `pauseGoal` / `resumeGoal` / `cancelGoal` β
* the target agent scope's `IAgentGoalService`; `getCronTasks` β
* with the v1 snapshot
* shape restored; `listBackgroundTasks` / `getBackgroundTaskOutput` β the
* `klient.session(id).agent(id)` facade; `stopBackgroundTask` /
* `detachBackgroundTask` β `IAgentTaskService` through the agent scope
* (the facade's no-reason stop substitutes a user-cancellation reason v1
* never records); `waitForBackgroundTasksOnPrint` /
* `handlePrintMainTurnCompleted` β rebuilt over the v2 print-mode config
* helpers and the session's per-agent task services (no v2 service owns
* the print policy).
* - `listGlobalMcpServers` / `getGlobalMcpServer` /
* `listGlobalMcpServerAuthStatuses` /
* `addGlobalMcpServer` / `updateGlobalMcpServer` /
* `removeGlobalMcpServer` / `beginGlobalMcpServerAuth` /
* `completeGlobalMcpServerAuth` / `cancelGlobalMcpServerAuth` /
* `resetGlobalMcpServerAuth` / `testGlobalMcpServer` /
* `testGlobalMcpServerConfig` / `inspectAppMcpServers` /
* `beginMcpServerAuth` / `completeMcpServerAuth` / `cancelMcpServerAuth` /
* `resetMcpServerAuth` β the engine's App-scope `IMcpManagementService`
* (through {@link engineAccessor}; no klient facade exists): the unified
* MCP management plane over the `mcpRegistry` read view β user-level
* `mcp.json` CRUD guarded against read-only plugin / project-layer
* collisions, the standalone connection probe, the locator-addressed
* inspection catalog (plugin entries included), and locator-addressed
* OAuth flows keyed by flowId. The managed-server results are mapped back
* to the v1 wire shape (config flattened to the top level); the inspection
* and auth-status shapes are field-identical between the engines.
* - `listMcpServers` / `getMcpStartupMetrics` / `reconnectMcpServer` /
* `addSessionMcpServer` β
* the seeded `ISessionMcpHandle.connectionManager` through the session
* scope (no klient facade exists) β one shared manager per workspace
* handler since the workspace-domain resource consolidation; the v2
* `McpServerEntry` is field-identical with v1's `McpServerInfo`.
* `reconnectMcpServer` with an explicit config and `addSessionMcpServer`
* ride the manager's upserting `connect`; both reject sessions whose
* handle is a merged ephemeral-server view (no `connect` on it), and an
* unpersisted add is visible to sibling sessions of the workspace (the v2
* manager has no session-local `caller` scope).
* - `onEvent` / `receiveEvent` β the base class registries, fed by a
* per-live-session wiring (`src/v2/session-wiring.ts`) that subscribes
* every live agent's `IEventBus` and translates each `DomainEvent` back
* into the v1 `Event` shape (`src/v2/event-mapper.ts`); the klient events
* hub is deliberately bypassed because its contract registry exposes only
* 13 of the bus types (no `shell.*`, no `turn.step.*`, ...). The one
* v1-visible fact on the process-global `IEventService`
* (`session.meta.updated`) is forwarded from a constructor subscription.
* - `setApprovalHandler` / `setQuestionHandler` β the base class registries,
* driven by the same session wiring: v1's push callbacks
* (`requestApproval` / `requestQuestion` / `toolCall`) are fed from the v2
* interaction kernel's pending set (`onDidChangePending`), and the outcome
* is written back through the kernel's `respond`.
* - `exportSession` β `ISessionExportService` (app scope, the v2 port of v1's
* export) through {@link engineAccessor}; `listSkills` β the session
* scope's `ISessionSkillCatalog`; `startBtw` β the session scope's
* `ISessionBtwService`; `setSwarmMode` / `swarm` β the agent scope's
* `IAgentSwarmService` (the v2 port of v1's `SwarmMode`), with `swarm()`
* recomposed over the `setSwarmMode` + `prompt` overrides; `setTowerMode` β
* the agent scope's `IAgentTowerService` (v2-only β the base class throws
* `not_implemented`).
* `createSessionWithKaos` / `resumeSessionWithKaos` deliberately keep the
* base class's kaos-ignoring degradation (the v2 engine has no kaos
* injection point β see the session-lifecycle section header), and
* `toolCall` keeps the base class's "not supported" answer, which the
* interaction bridge already relies on.
*/
import { readdir } from 'node:fs/promises';
import { join } from 'node:path';
import { encodeWorkDirKey } from '@moonshot-ai/agent-core-v2/_base/utils/workdir-slug';
import { McpConnectionManager } from '@moonshot-ai/agent-core-v2/mcpCore/connection-manager';
import {
loadMcpServers,
loadMcpServersDetailed,
resolveMcpJsonPaths,
} from '@moonshot-ai/agent-core-v2/app/mcpConfig/configLoader';
import { fsSuggestRequestSchema } from '@moonshot-ai/agent-core-v2/workspace/workspaceFs/fs';
import { IAppendLogStore } from '@moonshot-ai/agent-core-v2/persistence/interface/appendLogStore';
import type { McpServerConfig as WorkspaceMcpServerConfig } from '@moonshot-ai/agent-core-v2/mcpCore/config-schema';
import {
bootstrap,
DEFAULT_AGENT_PROFILE_NAME,
drainLogCloses,
drainQueryStoreDisposals,
drainSessionIndexMirror,
ensureKimiHome,
ensureMainAgent,
agentContextOf,
IAgentContextMemoryService,
IAgentConversationUndoService,
IAgentCronService,
IAgentFullCompactionService,
IAgentGoalService,
IAgentPluginService,
IAgentLifecycleService,
IAgentLoopService,
IAgentPermissionModeService,
IAgentPermissionRulesService,
IAgentPluginCommandService,
IAgentProfileService,
IAgentReminderService,
IAgentSkillService,
IAgentSwarmService,
IAgentTaskService,
ISessionTokenCountingService,
IAgentToolPolicyService,
IAgentToolRegistryService,
type HostUiCapability,
IAgentTowerService,
IBootstrapService,
IConfigService,
IEventService,
IFlagService,
IHostEnvironment,
IHostFileSystem,
IMcpManagementService,
IMcpOAuthService,
IModelService,
IProviderService,
ISessionBtwService,
ISessionContext,
ISessionExportService,
ISessionIndex,
ISessionIndexMirror,
ISessionInitService,
ISessionManager,
ISessionMcpHandle,
ISessionMetadata,
ISessionSkillCatalog,
IAgentTodoService,
ISessionWorkspaceContext,
ITelemetryService,
IWorkspaceAliases,
ISessionActivityView,
IWorkspaceInstanceManager,
closeSessionById,
followSessionLifecycles,
getLiveSessionById,
isError2,
programForSession,
resumeSessionById,
sessionDirOf,
workspacePersistenceScope,
logSeed,
MAIN_AGENT_ID,
prepareSystemPromptContext,
PRINT_MAX_TURNS_DEFAULT,
PRINT_WAIT_CEILING_S_DEFAULT,
ProfileError,
ProfileErrors,
Error2 as V2Error2,
ErrorCodes as V2ErrorCodes,
resolveAgentTaskConfig,
resolveConfigPath,
resolveKimiHome,
resolveLoggingConfig,
resolvePrintBackgroundMode,
summarizeSkill,
towerEnterFailureMessage,
type IAgentScopeHandle,
type IDisposable,
type ISessionScopeHandle,
type McpManagedServer,
type Scope,
type ServicesAccessor,
type SessionSummary as V2SessionSummary,
} from '@moonshot-ai/agent-core-v2';
import type { AgentHandle, Klient } from '@moonshot-ai/klient';
import { createKlient } from '@moonshot-ai/klient/memory';
import { assertKimiHostIdentity, createKimiDefaultHeaders } from '@moonshot-ai/kimi-code-oauth';
import { KimiAuthFacade } from '#/auth';
import { ensureConfigFile, HookDefSchema } from '#/config/index';
import type { AgentContextData } from '#/context';
import { ErrorCodes, isKimiErrorCode, KimiError, type KimiErrorCode } from '#/errors';
import type { ExperimentalFeatureState } from '#/flag';
import { KimiHarness } from '#/kimi-harness';
import type { BeginGlobalMcpServerAuthResult } from '#/mcp';
import { limitAgentReplayByTurns } from '#/replay';
import { noopTelemetryClient } from '#/telemetry';
import {
SDKRpcClientBase,
type ActivatePluginCommandRpcInput,
type ActivateSkillRpcInput,
type ImportContextRpcInput,
type ReconnectMcpServerRpcInput,
type ReloadSessionRpcInput,
type RunCommandRpcInput,
type SessionIdRpcInput,
type SwitchSessionRuntimeRpcInput,
type SessionPromptRpcInput,
type SessionPromptWithSkillsRpcInput,
type SetSessionModelRpcInput,
type SetSessionModelRpcResult,
type SetSessionPermissionRpcInput,
type SetSessionPlanModeRpcInput,
type SetSessionSwarmModeRpcInput,
type SetSessionThinkingRpcInput,
type SetSessionTowerModeRpcInput,
type UpdateSessionMetadataRpcInput,
} from '#/rpc';
import type {
AddAdditionalDirInput,
AddAdditionalDirResult,
AgentCommandInfo,
AgentRuntimeBinding,
AppMcpServerInspection,
BackgroundTaskInfo,
CapabilityStatus,
CompactOptions,
ConfigDiagnostics,
CreateGoalInput,
CreateSessionOptions,
ExportSessionInput,
ExportSessionResult,
FileMeta,
ForkSessionInput,
GenerateSessionTitleInput,
GetConfigOptions,
GetCronTasksResult,
GlobalMcpServerAuthStatus,
GoalSnapshot,
GoalToolResult,
JsonObject,
KimiConfig,
KimiConfigPatch,
KimiHarnessOptions,
KimiHostIdentity,
ListSessionsOptions,
McpManagedServerInfo,
McpServerConfig,
McpServerInfo,
McpServerLocator,
McpStartupMetrics,
McpTestResult,
OAuthRefreshOutcome,
PluginCommandDef,
PluginInfo,
PluginSummary,
ReloadSummary,
RenameSessionInput,
ResumeSessionInput,
ResumedAgentState,
ResumedSessionSummary,
SessionPlan,
SessionStatus,
SessionSummary,
SessionSummaryPage,
SessionTodoItem,
SessionUsage,
SkillSummary,
SuggestFilesInput,
SuggestFilesResult,
TelemetryClient,
UploadFileOptions,
WorkspaceTrustInfo,
} from '#/types';
import {
diagnosticsToConfigDiagnostics,
planProviderRemoval,
resolvedConfigToKimiConfig,
} from '#/v2/config-mapper';
import { translateGlobalEvent } from '#/v2/event-mapper';
import { assertImportFits, buildImportContextMessage } from '#/v2/import-context';
import { foldAgentWireReplay } from '#/v2/resume-replay';
import {
mcpConfigWithoutName,
normalizeServerName,
parseInlineMcpServer,
parseReconnectMcpServerConfig,
} from '#/v2/global-mcp';
import {
normalizeWorkDir,
v2MetaToSessionMeta,
v2SummaryToSessionSummary,
} from '#/v2/session-mapper';
import { SessionEventWiring } from '#/v2/session-wiring';
export interface SDKRpcClientV2Options {
readonly homeDir?: string;
readonly configPath?: string;
readonly identity?: KimiHostIdentity;
/**
* Explicit skill directories for this process (v1's SDK `skillDirs` /
* the CLI's `--skills-dir`): when non-empty, default user / project skill
* discovery is skipped and these directories serve as the user skill
* source. Passed into the engine through `BootstrapInput.args.skillDirs`.
*/
readonly skillDirs?: readonly string[];
readonly telemetry?: TelemetryClient;
readonly onOAuthRefresh?: (outcome: OAuthRefreshOutcome) => void;
readonly uiMode?: string;
/** UI surfaces this host renders; forwarded as `BootstrapInput.args.uiCapabilities`. */
readonly uiCapabilities?: readonly HostUiCapability[];
}
/**
* The largest `setTimeout` delay before Node's timer overflows into an
* immediate fire (2^31 - 1 ms β 24.8 days) β the same bound v1's
* `timeoutOutcome` clamps to.
*/
const MAX_TIMER_DELAY_MS = 0x7fffffff;
export class SDKRpcClientV2 extends SDKRpcClientBase {
readonly homeDir: string;
readonly configPath: string;
readonly identity: KimiHostIdentity | undefined;
readonly telemetry: TelemetryClient;
readonly auth: KimiAuthFacade;
readonly klient: Klient;
private readonly app: Scope;
/**
* The engine's config reads (`get`/`getAll`/`inspect`/`diagnostics`) are
* synchronous over state that only exists once the initial load settles;
* unlike the mutating methods they do not await `IConfigService.ready`
* internally, so every config override below awaits this first. Awaiting
* the engine's own ready handle (via the accessor) instead of issuing a
* dummy facade call keeps the reads honest no-ops.
*/
private readonly configReady: Promise<void>;
/**
* Per-session print-steer state for `handlePrintMainTurnCompleted`: v1
* keeps the deadline/turn counters on the `Session` object, so they reset
* when the session closes (a resume builds a fresh `Session`); mirrored
* here by deleting the entry in {@link unwireSession}, which every close
* path (client, engine, delete) funnels through.
*/
private readonly printSteerStates = new Map<string, { deadline?: number; turns: number }>();
/**
* The model/provider registries (`IModelService` / `IProviderService`)
* share the config service's ready trap: their `get`/`list` reads are
* synchronous over state that only exists after hydration, and every
* agent-side model operation (profile bind, `setModel`, capability reads)
* flows through them. Agent-interaction overrides await this before
* touching a profile.
*/
private readonly modelReady: Promise<void>;
/**
* Per-live-session event/interaction wirings (`src/v2/session-wiring.ts`):
* created when a session materializes through this client (create / resume /
* fork / reload), dropped on close (ours or the engine's). Each wiring feeds
* the base class's event listeners from the session's per-agent event buses
* and bridges its pending approvals / questions / user-tool calls to the
* registered handlers.
*/
private readonly sessionWirings = new Map<string, SessionEventWiring>();
/**
* Per-session serialization for the operations that change a session's
* live ownership: the temporary resumeβactβclose paths (`renameSession`,
* `generateSessionTitle`) and the public `resumeSession` / `closeSession`
* / `reloadSession`. Chaining them through one queue per session id makes
* the handoff atomic β a public resume either lands first (the temporary
* path then reuses the live handle and leaves it open) or waits for the
* temporary close to finish and materializes a fresh scope, so a caller
* can never receive a handle whose close is already in flight.
*/
private readonly sessionAccessQueues = new Map<string, Promise<void>>();
/** App-scope subscriptions (global event forwarding, lifecycle tracking), disposed in {@link close}. */
private readonly appSubscriptions: IDisposable[] = [];
constructor(options: SDKRpcClientV2Options = {}) {
super();
this.identity =
options.identity === undefined ? undefined : assertKimiHostIdentity(options.identity);
this.homeDir = resolveKimiHome(options.homeDir);
this.configPath = resolveConfigPath({
homeDir: this.homeDir,
configPath: options.configPath,
});
ensureKimiHome(this.homeDir);
this.telemetry = options.telemetry ?? noopTelemetryClient;
this.auth = new KimiAuthFacade({
homeDir: this.homeDir,
configPath: this.configPath,
identity: this.identity,
onRefresh: options.onOAuthRefresh,
});
const identity = assertKimiHostIdentity(this.identity);
const { app } = bootstrap(
{
homeDir: this.homeDir,
configPath: this.configPath,
clientIdentity: identity,
args: {
// Host identity headers for the engine's outbound requests (model,
// WebSearch, registry refresh). Without them the managed vendors go
// out with the SDK's default User-Agent and no X-Msh-* at all.
requestHeaders: createKimiDefaultHeaders({ homeDir: this.homeDir, ...identity }),
// `--skills-dir` (v1 parity): explicit skill dirs replace default
// user / project discovery for every session this client hosts.
skillDirs: options.skillDirs,
uiCapabilities: options.uiCapabilities,
},
},
[...logSeed(resolveLoggingConfig({ homeDir: this.homeDir, env: process.env }))],
);
this.app = app;
this.klient = createKlient({ scope: app });
this.configReady = app.accessor.get(IConfigService).ready;
this.installEngineTelemetry(options.telemetry);
this.modelReady = Promise.all([
this.configReady,
app.accessor.get(IModelService).ready,
app.accessor.get(IProviderService).ready,
]).then(() => undefined);
this.appSubscriptions.push(
// v1's stream carries `session.meta.updated` (the prompt metadata
// path) β the one v1-visible fact the v2 engine publishes on the
// process-global IEventService rather than a per-agent bus. Every other
// global-bus type is a daemon/WS-edge event the in-process v1 client
// never saw, so the translation filters down to that single type.
this.app.accessor.get(IEventService).subscribe((event) => {
const translated = translateGlobalEvent(event);
if (translated !== undefined) this.receiveEvent(translated);
}),
// A session closed without going through this client (archive, an
// engine-initiated close) drops its wiring with the scope. Close events
// fire per workspace handler, so follow every handler β present and
// future β through the App-scope registry.
followSessionLifecycles(this.app.accessor, (service) =>
service.onDidCloseSession((closed) => {
this.unwireSession(closed.sessionId);
}),
),
);
}
async ensureConfigFile(): Promise<void> {
await ensureConfigFile(this.configPath);
// Surface a missing Git Bash early, before the TUI starts. The wait is
// Windows-only: the failure cannot happen on POSIX, and `ready` also
// covers the login-shell PATH enrichment, which spawns the user's login
// shell (5s timeout) β config-only commands must not block on that.
if (process.platform === 'win32') {
await this.app.accessor.get(IHostEnvironment).ready;
}
}
async close(): Promise<void> {
for (const wiring of this.sessionWirings.values()) {
wiring.dispose();
}
this.sessionWirings.clear();
for (const subscription of this.appSubscriptions) {
subscription.dispose();
}
await this.klient.close();
// Same shutdown order as kap-server: drain the session-index mirror while
// the query store is still open, then await the asynchronous closes that
// disposal fires β a host that removes homeDir right after close() must
// not race an in-flight shard close (ENOTEMPTY on teardown).
await this.app.accessor.get(ISessionIndexMirror).drain();
// Await the OAuth service shutdown directly rather than after dispose():
// its ledger-teardown dispose can queue behind slow async disposables, and
// the accessor throws once the scope is disposed. shutdown() is
// idempotent, so the ledger's own teardown turns into a no-op.
await this.app.accessor.get(IMcpOAuthService).shutdown();
const appendLogStore = this.app.accessor.get(IAppendLogStore);
this.app.dispose();
await appendLogStore.drainRetirements();
await drainSessionIndexMirror();
await drainQueryStoreDisposals();
await drainLogCloses();
}
/**
* Forward engine telemetry to the host-supplied client. Without this the
* client only served `KimiHarness`-level events and every engine-side event
* (`track2` facts from agent/session scopes) was dropped on the v2 route.
* The v1 `TelemetryClient` is wrapped into the engine appender record shape
* (event + ambient context + final properties). The `telemetry` config
* section gates engine events the same way the v2 print runner gates them;
* the host keeps owning the client's lifecycle (flush / shutdown stay with
* the host, matching the v1 core's arrangement).
*
* The engine's own `session_started` is forwarded unless
* {@link suppressEngineSessionStarted} was called β see its doc for why the
* harness-assembled client drops that row.
*/
private installEngineTelemetry(client: TelemetryClient | undefined): void {
if (client === undefined) return;
const telemetry = this.app.accessor.get(ITelemetryService);
telemetry.addAppender({
track: (record) => {
if (this.engineSessionStartedSuppressed && record.event === 'session_started') return;
client.track(record.event, record.properties);
},
});
void this.configReady.then(() => {
telemetry.setEnabled(this.engineAccessor.get(IConfigService).get('telemetry') !== false);
});
}
private engineSessionStartedSuppressed = false;
/**
* Drop the engine's own `session_started` from telemetry forwarding. Called
* by `createKimiHarness` at assembly time: the harness emits that event
* for every session it opens (create / resume / reload / fork) with the
* richer client-attribution schema, so the engine's
* `{resumed, experimental_flags}` copy would double-count every open.
* Direct `SDKRpcClientV2` consumers never call this and keep the engine row
* β it is their only `session_started` producer. Hosts without a harness
* (run-v2-print, kap-server) wire their own appenders and are unaffected
* either way.
*/
suppressEngineSessionStarted(): void {
this.engineSessionStartedSuppressed = true;
}
/**
* Exposed experimental flag ids in the `session_started` wire shape (sorted,
* comma-joined), read live from the in-process engine's flag service. The
* harness-side `session_started` row merges this so both producers of the
* event carry the same flag dimension. Exposure is the flag system's own
* notion (`IFlagService.exposedIds`): a flag that is enabled but not yet
* active in this process (e.g. its feature assembles at App construction)
* does not count.
*/
enabledExperimentalFlags(): string {
return this.engineAccessor.get(IFlagService).exposedIds().toSorted().join(',');
}
/**
* Escape hatch to the in-process engine's app-scope service accessor, for
* SDK methods whose capability exists in agent-core-v2 but is not (yet)
* exposed through the klient facade. This is a deliberate migration
* pressure valve, not a new public API direction:
* - it only exists because this client owns the bootstrapped `Scope` β
* there is nothing equivalent on a remote (ipc) transport, so anything
* built on it is in-process-only by construction;
* - it resolves App-scope services only. Session/agent services need their
* own scope handles (via the lifecycle services), not this accessor;
* - every use should name the klient facade method it stands in for, and
* move onto the facade once one exists. Remove when the migration ends.
*/
get engineAccessor(): ServicesAccessor {
return this.app.accessor;
}
override async getExperimentalFeatures(): Promise<readonly ExperimentalFeatureState[]> {
return this.klient.global.flags.list();
}
/**
* `uploadFile` β `klient.global.files.save` (the app-scope `IFileService`).
* The SDK's single `name` doubles as the engine's `filename`; the engine's
* `SaveOptions.name` (display name) defaults to it.
*/
override async uploadFile(data: Uint8Array, options: UploadFileOptions): Promise<FileMeta> {
return this.klient.global.files.save({
data,
filename: options.name,
mimeType: options.mimeType,
expiresInSec: options.expiresInSec,
});
}
override async deleteFile(fileId: string): Promise<void> {
return this.klient.global.files.delete(fileId);
}
/**
* Through the workspace handler's `IWorkspaceSkillCatalog` β the engine's
* own merged view (builtin / user / explicit / extra / workspace-root /
* plugin), so the session-less list matches what a session would serve.
* `handlerFor` is create-or-get: session creation materializes the handler
* anyway.
*/
override async listWorkspaceSkills(workDir: string): Promise<readonly SkillSummary[]> {
const handler = await this.engineAccessor
.get(IWorkspaceInstanceManager)
.getOrCreate({ root: normalizeRequiredWorkDir('listWorkspaceSkills', workDir) });
const catalog = handler.program.skills;
await catalog.ready;
return catalog.catalog.listSkills().map(summarizeSkill);
}
/**
* Through the workspace handler's `IWorkspaceFsService` β the same engine
* suggest the kap-server `fs:suggest` routes serve (fuzzy scoring,
* directories included, gitignore respected), so in-process hosts match
* the web client's @ mention results.
*/
override async suggestFiles(workDir: string, input: SuggestFilesInput): Promise<SuggestFilesResult | undefined> {
const parsed = fsSuggestRequestSchema.safeParse({
query: input.query,
limit: input.limit ?? 50,
follow_gitignore: true,
show_hidden: false,
});
if (!parsed.success) {
const issue = parsed.error.issues[0];
const where = issue !== undefined && issue.path.length > 0 ? `${String(issue.path[0])}: ` : '';
throw new KimiError(
ErrorCodes.REQUEST_INVALID,
`suggestFiles ${where}${issue?.message ?? 'invalid input'}`,
);
}
const handler = await this.engineAccessor
.get(IWorkspaceInstanceManager)
.getOrCreate({ root: normalizeRequiredWorkDir('suggestFiles', workDir) });
const result = await handler.program.fs.suggest(parsed.data);
return {
items: result.items.map((item) => ({
path: item.path,
name: item.name,
kind: item.kind,
matchPositions: item.match_positions,
})),
truncated: result.truncated,
};
}
/**
* klient has no workspace-trust facade; composed directly from the engine
* via {@link engineAccessor} β the same `handlerFor({ root })` path
* `createSession` takes (materializing the workspace handler is a no-op
* cost here: session creation does it anyway). The gated-server list is
* the final merged config entries whose origins are project files (the
* workspaceTrust gate inside the engine's `workspaceMcpConfig`),
* computed best-effort: an unreadable/invalid project file degrades to an
* empty list rather than failing the caller.
*/
override async getWorkspaceTrustInfo(workDir: string): Promise<WorkspaceTrustInfo> {
const handler = await this.engineAccessor
.get(IWorkspaceInstanceManager)
.getOrCreate({ root: workDir });
const trusted = await handler.program.trust.get();
if (trusted) return { trusted: true, gatedMcpServers: [] };
try {
const fs = this.engineAccessor.get(IHostFileSystem);
const [paths, loaded] = await Promise.all([
resolveMcpJsonPaths({ fs, cwd: workDir, homeDir: this.homeDir }),
loadMcpServersDetailed({
fs,
cwd: workDir,
homeDir: this.homeDir,
includeProject: true,
}),
]);
const projectPaths = new Set([paths.projectRoot, paths.project]);
const gatedMcpServers = Object.entries(loaded.servers)
.filter(([name]) => projectPaths.has(loaded.origins[name] ?? ''))
.map(([name, config]) => describeWorkspaceMcpServer(name, config))
.toSorted((a, b) => a.name.localeCompare(b.name));
return { trusted: false, gatedMcpServers };
} catch {
return { trusted: false, gatedMcpServers: [] };
}
}
/**
* klient has no workspace-trust facade; see {@link getWorkspaceTrustInfo}.
* The flip fires `IWorkspaceTrust.onDidChange`, which makes the engine's
* `workspaceMcpConfig` reload with project files included β project MCP
* servers connect live, no restart needed.
*/
override async trustWorkspace(workDir: string): Promise<void> {
const handler = await this.engineAccessor
.get(IWorkspaceInstanceManager)
.getOrCreate({ root: workDir });
await handler.program.trust.trust();
}
/**
* v1 returns the whole config.toml document as one `KimiConfig`; v2
* resolves the same file per config domain. `getAll()` is the effective
* view (file + env overlays + section defaults), which matches v1's
* runtime config (`loadRuntimeConfigSafe` + the KIMI_MODEL_* overlay);
* `reload` mirrors v1's re-read-from-disk option.
*/
override async getConfig(options?: GetConfigOptions): Promise<KimiConfig> {
await this.configReady;
if (options?.reload) {
await this.klient.global.config.reload();
}
return resolvedConfigToKimiConfig(await this.klient.global.config.getAll());
}
override async getConfigDiagnostics(): Promise<ConfigDiagnostics> {
await this.configReady;
return diagnosticsToConfigDiagnostics(await this.klient.global.config.diagnostics());
}
/**
* A v1 patch is one deep-merge over the whole document; v2 deep-merges
* per domain with the same plain-object-recursive / array-replace
* semantics, so the patch fans out one `config.set` per top-level field.
* Unknown-to-v2 fields (`yolo`, `planMode`, `telemetry`, ...) persist as
* unregistered pass-through domains, like v1's schema keeping them.
*/
override async setConfig(patch: KimiConfigPatch): Promise<KimiConfig> {
await this.configReady;
for (const [domain, domainPatch] of Object.entries(patch)) {
if (domainPatch === undefined) continue;
await this.klient.global.config.set({ domain, patch: domainPatch });
}
return this.getConfig();
}
/**
* v1's removal cascades: the provider entry, every model pointing at it,
* and the default pointers when they dangle. The engine's own
* `kosong.removeProvider` only clears the default-provider pointer, so the
* full v1 cascade is computed from the user-layer values (see
* `planProviderRemoval`) and persisted as ONE atomic multi-section
* replace β the same single-write shape as v1's `removeKimiProvider`, so a
* process exit can never leave the file in a halfway-cascaded state. The
* `[secondary_model]` section is left alone on purpose: an entry whose
* model no longer resolves fails pool validation on the next session
* create, surfacing a named error instead of silently rewriting the
* user's configuration.
*/
override async removeProvider(providerId: string): Promise<KimiConfig> {
await this.configReady;
const [providers, models, defaultModel, defaultProvider] = await Promise.all([
this.klient.global.config.inspect<Record<string, unknown>>('providers'),
this.klient.global.config.inspect<Record<string, Record<string, unknown>>>('models'),
this.klient.global.config.inspect<string>('defaultModel'),
this.klient.global.config.inspect<string>('defaultProvider'),
]);
const plan = planProviderRemoval({
providers: providers.userValue,
models: models.userValue,
defaultModel: defaultModel.userValue,
defaultProvider: defaultProvider.userValue,
providerId,
});
const sections: Record<string, unknown> = {
providers: plan.providers,
models: plan.models,
};
if (plan.clearDefaultModel) {
sections['defaultModel'] = undefined;
}
if (plan.clearDefaultProvider) {
sections['defaultProvider'] = undefined;
}
await this.klient.global.config.replaceSections({ sections });
return this.getConfig();
}
override supportsAtomicSectionReplace(): boolean {
return true;
}
override async replaceConfigSections(sections: Record<string, unknown>): Promise<void> {
await this.configReady;
await this.klient.global.config.replaceSections({ sections });
}
override async listPlugins(): Promise<readonly PluginSummary[]> {
return this.klient.global.plugins.list();
}
override async installPlugin(source: string): Promise<PluginSummary> {
return this.klient.global.plugins.install(source);
}
override async setPluginEnabled(id: string, enabled: boolean): Promise<void> {
return this.klient.global.plugins.setEnabled({ id, enabled });
}
override async setPluginMcpServerEnabled(
id: string,
server: string,
enabled: boolean,
): Promise<void> {
return this.klient.global.plugins.setMcpServerEnabled({ id, server, enabled });
}
override async removePlugin(id: string): Promise<void> {
return this.klient.global.plugins.remove(id);
}
override async reloadPlugins(): Promise<ReloadSummary> {
const summary = await this.klient.global.plugins.reload();
await this.refreshPluginSessionStarts();
return summary;
}
override async getPluginInfo(id: string): Promise<PluginInfo> {
// The v2 engine's hook-event union is a superset of v1's (`TurnStarted`,
// `UserPromptQueued`, `TaskStarted`, `SessionHeartbeat` are v2-only). The
// SDK contract keeps the v1 `PluginInfo` shape, so hooks using v2-only
// events are dropped from the projection β mirroring how the config
// mapper drops config domains v1 does not know.
const info = await this.klient.global.plugins.info(id);
const manifest =
info.manifest === undefined
? undefined
: {
...info.manifest,
hooks: info.manifest.hooks?.filter((hook) =>
(HookDefSchema.shape.event.options as readonly string[]).includes(hook.event),
) as NonNullable<PluginInfo['manifest']>['hooks'],
};
return { ...info, manifest };
}
/**
* Capability surface (v2-only): built-in product capabilities (kimi-cu,
* kimi-webbridge) with layered readiness and idempotent installs. v1 has
* no capability domain, so these stay off the shared base β callers
* feature-detect via `in` before use.
*/
async listCapabilities(): Promise<readonly CapabilityStatus[]> {
return this.klient.global.capabilities.list();
}
async getCapability(id: string): Promise<CapabilityStatus> {
return this.klient.global.capabilities.get(id);
}
async installCapability(id: string): Promise<CapabilityStatus> {
return this.klient.global.capabilities.install(id);
}
/**
* Scope gap: v1 answers from the session's creation-time snapshot of the
* enabled plugin commands, while the v2 engine only exposes the app-global
* live view (`pluginService.listPluginCommands`), so the sessionId is
* ignored here. The two agree for any session created after the last
* plugin change; a v1 session predating an install/toggle goes stale where
* v2 stays live.
*/
override async listPluginCommands(
input: SessionIdRpcInput,
): Promise<readonly PluginCommandDef[]> {
void input;
return this.listPluginCommandsGlobal();
}
/** App-global live view of the enabled plugin commands, no session required. */
override async listPluginCommandsGlobal(): Promise<readonly PluginCommandDef[]> {
return this.klient.global.plugins.listCommands();
}
// -----------------------------------------------------------------------
// Session lifecycle
//
// The v2 engine splits what v1's SessionStore + in-memory session map did
// across the app-scope `ISessionIndex` (persisted read model),
// `IWorkspaceLifecycleService` (live workspace handlers and, under them, the
// live session scopes), and the session-scope
// metadata/workspace services. The klient facade covers listing and the
// metadata mutations of a LIVE session; everything that needs an explicit
// session id, a resume, or a workspace command goes through the
// `engineAccessor` escape hatch (named per method below).
//
// `createSessionWithKaos` / `resumeSessionWithKaos` are deliberately NOT
// overridden: agent-core-v2 has no kaos injection point (its fs/process
// abstraction is the engine-internal hostFs domain, resolved at bootstrap),
// so the base class's degradation β ignore the kaos arguments and run a
// plain local create/resume β is the honest behavior, the same one every
// daemon-transport client settles for. Failing loudly instead would break
// hosts that pass kaos opportunistically (the harness forwards it whenever
// the host supplies one).
// -----------------------------------------------------------------------
private liveSession(sessionId: string): ISessionScopeHandle | undefined {
return getLiveSessionById(this.engineAccessor, sessionId);
}
/**
* Runs `work` after every previously queued operation on the same session
* settles; different sessions still run in parallel. The map entry drops
* itself once the queue drains.
*/
private runSessionAccess<T>(sessionId: string, work: () => Promise<T>): Promise<T> {
const previous = this.sessionAccessQueues.get(sessionId) ?? Promise.resolve();
const run = previous.then(work, work);
const tail = run.then(
() => undefined,
() => undefined,
);
this.sessionAccessQueues.set(sessionId, tail);
void tail.then(() => {
if (this.sessionAccessQueues.get(sessionId) === tail) {
this.sessionAccessQueues.delete(sessionId);
}
});
return run;
}
/**
* Multi-key variant of {@link runSessionAccess}: acquires the queues in
* sorted order so concurrent multi-key operations (fork AβB vs fork BβA)
* cannot deadlock.
*/
private runSessionAccessAll<T>(sessionIds: readonly string[], work: () => Promise<T>): Promise<T> {
const keys = [...new Set(sessionIds)].toSorted();
let chained: () => Promise<T> = work;
for (const key of [...keys].toReversed()) {
const inner = chained;
chained = () => this.runSessionAccess(key, inner);
}
return chained();
}
/**
* Runs `action` against the session without changing its live footprint: a
* session that is already live (publicly resumed or created through this
* client) is used in place and left open, while a cold session is resumed
* for the duration of the action and closed again. Only safe inside
* {@link runSessionAccess} β the queue is what makes the resume/close pair
* atomic against the public lifecycle operations.
*/
private async withTemporarySession<T>(
sessionId: string,
action: () => Promise<T>,
): Promise<T> {
if (this.liveSession(sessionId) !== undefined) return action();
const handle = await resumeSessionById(this.engineAccessor, sessionId);
if (handle === undefined) throw SDKRpcClientV2.sessionNotFound(sessionId);
try {
return await action();
} finally {
await closeSessionById(this.engineAccessor, sessionId);
}
}
/** v1's `requireSession` / store lookup failure shape. */
private static sessionNotFound(sessionId: string): KimiError {
return new KimiError(ErrorCodes.SESSION_NOT_FOUND, `Session "${sessionId}" was not found`, {
details: { sessionId },
});
}
/** The live session handle, or the error v1 raises for a non-active session. */
private requireLiveSession(sessionId: string): ISessionScopeHandle {
const handle = this.liveSession(sessionId);
if (handle === undefined) throw SDKRpcClientV2.sessionNotFound(sessionId);
return handle;
}
/**
* v1's persist-add project guard ported to the workspace loader. This read
* deliberately includes the project layer even while the workspace is
* untrusted: a user-level write must not create a shadow that springs into
* conflict when the workspace is trusted later.
*/
private async rejectProjectLayerPersistedMcpAdd(
cwd: string,
name: string,
): Promise<void> {
const fs = this.engineAccessor.get(IHostFileSystem);
const [withProject, userOnly] = await Promise.all([
loadMcpServers({ fs, cwd, homeDir: this.homeDir, includeProject: true }),
loadMcpServers({ fs, cwd, homeDir: this.homeDir, includeProject: false }),
]);
if (withProject[name] !== undefined && userOnly[name] === undefined) {
throw new KimiError(
ErrorCodes.REQUEST_INVALID,
`MCP server "${name}" is read-only: it is defined in the project MCP config β edit that file instead`,
);
}
}
/**
* Attach the event/interaction wiring to a freshly materialized session
* (idempotent). Unwiring needs no call site of its own: every close path
* goes through the engine's lifecycle close, whose `onDidCloseSession`
* subscription (constructor) drops the wiring.
*/
private wireSession(handle: ISessionScopeHandle): void {
if (this.sessionWirings.has(handle.id)) return;
this.sessionWirings.set(handle.id, new SessionEventWiring(handle, this));
}
private unwireSession(sessionId: string): void {
// v1's print-steer counters die with the Session object; drop ours with
// every close path (ours, the engine's, or a delete).
this.printSteerStates.delete(sessionId);
const wiring = this.sessionWirings.get(sessionId);
if (wiring === undefined) return;
this.sessionWirings.delete(sessionId);
wiring.dispose();
}
/**
* The v1 summary of a live session, read from its own scope services (the
* metadata document, the context's cwd/sessionDir, the workspace context's
* additional dirs) rather than the index β no disk round-trip, and the
* additional dirs only exist on the live session in both engines.
*/
private async liveSessionSummary(handle: ISessionScopeHandle): Promise<SessionSummary> {
const meta = await handle.accessor.get(ISessionMetadata).read();
const ctx = handle.accessor.get(ISessionContext);
const workspace = handle.accessor.get(ISessionWorkspaceContext);
// The live aggregate is authoritative for a live session: a just-resumed
// session already has the restored outcome in memory, while the metadata
// document can lag both the backfill and the clear (a retry started after
// a failure), so never read the document here.
const liveOutcome = handle.accessor.get(ISessionActivityView).state().lastTurnReason;
return {
id: meta.id,
title: meta.title,
titleKind: meta.titleKind,
lastPrompt: meta.lastPrompt,
workDir: ctx.cwd,
sessionDir: ctx.sessionDir,
createdAt: meta.createdAt,
updatedAt: meta.updatedAt,
archived: meta.archived,
metadata: meta.custom as JsonObject | undefined,
additionalDirs: workspace.additionalDirs,
lastTurnReason: liveOutcome,
};
}
/**
* The `ResumedSessionSummary` of a just-materialized session, including the
* per-agent snapshot v1 serves: the live slices are read from the restored
* agent scope (profile / permission / swarm services and the klient agent
* facade for context / plan / usage / background tasks), while `replay` and
* `toolStore` are folded from the agent's `wire.jsonl` by
* {@link foldAgentWireReplay} over the engine's `foldWireRecords`.
* `warning` stays undefined β v2's resume has no migration-warning channel.
*/
private async resumedSessionSummary(
handle: ISessionScopeHandle,
replay?: { readonly includeSubagents?: boolean; readonly replayTurnLimit?: number },
): Promise<ResumedSessionSummary> {
const meta = await handle.accessor.get(ISessionMetadata).read();
const agents: Record<string, ResumedAgentState> = {};
// v1 resumes the main agent eagerly; materializing here cold-restores its
// wire into the scope (create-or-get) and applies the default binding.
const main = await this.materializeMainAgent(handle);
agents[MAIN_AGENT_ID] = await this.resumedAgentState(
handle,
main,
'main',
replay?.replayTurnLimit,
);
if (replay?.includeSubagents === true) {
const agentsDir = join(handle.accessor.get(ISessionContext).sessionDir, 'agents');
let subagentIds: readonly string[] = [];
try {
subagentIds = (await readdir(agentsDir, { withFileTypes: true }))
.filter((entry) => entry.isDirectory() && entry.name !== MAIN_AGENT_ID)
.map((entry) => entry.name);
} catch {
// No agents directory at all β the main agent is the whole roster.
}
for (const agentId of subagentIds) {
try {
// `create` is create-or-get and cold-restores the persisted wire.
await handle.accessor.get(IAgentLifecycleService).create({ agentId });
agents[agentId] = await this.resumedAgentState(
handle,
handle.accessor.get(IAgentLifecycleService).handleOf(agentId)!,
'sub',
replay.replayTurnLimit,
);
} catch {
// Best-effort, same as v1: a subagent whose restore fails is left
// out of the map (v1 logs a warning and continues with the rest).
}
}
}
return {
...(await this.liveSessionSummary(handle)),
sessionMetadata: v2MetaToSessionMeta(meta),
agents,
warning: undefined,
};
}
/**
* One agent's v1 `ResumedAgentState`. The scope reads mirror v1's
* `resumeSessionResult` field-by-field; the casts only bridge the two
* packages' type declarations (the wire shapes are the documented-identical
* ports, same as the `getContext` / `listBackgroundTasks` overrides). One
* deliberate gap: `config.provider` is always undefined β v1 resolves the
* full runtime `ProviderConfig` into the snapshot, agent-core-v2 has no
* equivalent read, and the TUI only falls back to `provider?.model` when
* `modelAlias` is unset (pinned in the parity KNOWN_DIFFS).
*/
private async resumedAgentState(
session: ISessionScopeHandle,
agent: IAgentScopeHandle,
type: 'main' | 'sub',
replayTurnLimit?: number,
): Promise<ResumedAgentState> {
const facade = this.klient.session(session.id).agent(agent.id);
const ctx = session.accessor.get(ISessionContext);
const [context, plan, usage, background, folded] = await Promise.all([
facade.getContext(),
facade.getPlan(),
facade.getUsage(),
facade.getTasks({ activeOnly: false }),
foldAgentWireReplay(join(ctx.sessionDir, 'agents', agent.id, 'wire.jsonl')),
]);
const profile = agent.accessor.get(IAgentProfileService).data();
const toolPolicy = agent.accessor.get(IAgentToolPolicyService);
const tools = agent.accessor.get(IAgentToolRegistryService).list().map((tool) => ({
name: tool.name,
description: tool.description,
active: toolPolicy.isToolActive(tool.name, tool.source),
source: tool.source,
}));
return {
type,
config: {
cwd: ctx.cwd,
provider: undefined,
modelAlias: profile.modelAlias,
modelCapabilities: profile.modelCapabilities,
profileName: profile.profileName,
thinkingEffort: profile.thinkingLevel,
systemPrompt: profile.systemPrompt,
},
context: context as AgentContextData,
replay: limitAgentReplayByTurns(folded.replay, replayTurnLimit),
permission: {
mode: agent.accessor.get(IAgentPermissionModeService).mode,
rules: [...agent.accessor.get(IAgentPermissionRulesService).rules],
} as ResumedAgentState['permission'],
plan: plan as ResumedAgentState['plan'],
swarmMode: agent.accessor.get(IAgentSwarmService).isActive,
usage: usage as ResumedAgentState['usage'],
tools: tools as ResumedAgentState['tools'],
toolStore: folded.toolStore,
background: background as readonly BackgroundTaskInfo[],
};
}
/**
* Every v2 workspace-id bucket addressing `workDir` (already normalized):
* the registered workspace's alias set when the catalog knows the root, or
* the freshly minted bucket key for index-only sessions (mirrors how v1's
* store lists a bucket that never touched the workspace registry).
*/
private async workspaceIdsFor(workDir: string): Promise<readonly string[]> {
const workspaces = await this.klient.global.workspaces.list();
const match = workspaces.find((workspace) => normalizeWorkDir(workspace.root) === workDir);
if (match === undefined) return [encodeWorkDirKey(workDir)];
return this.engineAccessor.get(IWorkspaceAliases).resolveAliasIds(match.id);
}
override async listSessions(input: ListSessionsOptions = {}): Promise<readonly SessionSummary[]> {
// Full-set semantics: drain keyset pages until the listing is exhausted
// (an unpaged query currently answers in one page, but a backend may cap
// it β never silently truncate the unpaged contract).
const all: SessionSummary[] = [];
let before: string | undefined;
for (;;) {
const page = await this.listSessionsPage({
workDir: input.workDir,
sessionId: input.sessionId,
includeArchived: input.includeArchived,
before,
});
all.push(...page.items);
if (page.nextCursor === undefined) return all;
before = page.nextCursor;
}
}
override async listSessionsPage(input: ListSessionsOptions = {}): Promise<SessionSummaryPage> {
// v1 rejects an empty workDir and bucket-filters by the normalized path;
// the v2 index filters by workspace-id set instead.
const workspaceIds =
input.workDir === undefined
? undefined
: await this.workspaceIdsFor(normalizeRequiredWorkDir('listSessions', input.workDir));
const workspacesById = new Map(
(await this.klient.global.workspaces.list()).map((workspace) => [workspace.id, workspace]),
);
const collected: SessionSummary[] = [];
let before = input.before;
// Entries dropped by the mapping (unrecoverable workDir) shrink the page;
// keep pulling keyset pages until the requested size is filled so callers
// never see a short or empty page that still carries a cursor.
for (;;) {
const remaining = input.limit === undefined ? undefined : input.limit - collected.length;
if (remaining !== undefined && remaining <= 0) break;
const page = await this.klient.global.sessions.list({
workspaceIds,
sessionId: input.sessionId,
includeArchived: input.includeArchived,
limit: remaining,
before,
});
if (page.items.length === 0) return { items: collected, nextCursor: undefined };
for (const item of page.items) {
const summary = this.mapIndexSummary(item, workspacesById);
if (summary !== undefined) collected.push(summary);
}
if (page.nextCursor === undefined) return { items: collected, nextCursor: undefined };
before = page.nextCursor;
if (input.limit === undefined) return { items: collected, nextCursor: before };
}
return { items: collected, nextCursor: before };
}
/**
* Map one v2 index summary to the v1 wire shape, resolving the filesystem
* facts the index does not carry. Returns `undefined` when the session's
* workDir is unrecoverable (corrupt metadata, deleted workspace): such a
* session cannot be resumed on either engine, and v1's store never lists
* one in the first place.
*/
private mapIndexSummary(
item: V2SessionSummary,
workspacesById: ReadonlyMap<string, { readonly root: string }>,
): SessionSummary | undefined {
const workDir = item.cwd ?? workspacesById.get(item.workspaceId)?.root;
if (workDir === undefined) return undefined;
// A live session reports its own outcome; the index may still carry a
// stale one while the mirror's clear is queued (a fresh turn just
// started after a failure).
const liveHandle = getLiveSessionById(this.engineAccessor, item.id);
const effectiveItem =
liveHandle === undefined
? item
: {
...item,
lastTurnReason: liveHandle.accessor.get(ISessionActivityView).state().lastTurnReason,
};
const bootstrapService = this.engineAccessor.get(IBootstrapService);
return v2SummaryToSessionSummary(effectiveItem, {
workDir,
sessionDir: sessionDirOf(
bootstrapService.homeDir,
workspacePersistenceScope(bootstrapService.scope('sessions'), item.workspaceId),
item.id,
),
});
}
/**
* v1 semantics: register the workDir as a workspace and create the session
* (the handler's `ISessionLifecycleService.create` does both; the klient facade
* wrapper is bypassed because it takes neither an explicit session id nor
* caller metadata). The `model` / `thinking` / `permission` options are the
* main-agent configuration v1 applies eagerly at creation: supplying any of
* them materializes the main agent here (v2 otherwise keeps it lazy) and
* binds the default profile with the requested model/thinking. v1 never
* validates either at create time β an unknown alias is recorded verbatim
* and an unlisted effort normalizes to the model default β so the bind is
* deliberately NOT `strictThinking`, and the v2-only create-time rejections
* that still leak through (unknown alias β `config.invalid`, no configured
* default model β `model.not_configured`) are pinned in the parity tests.
*/
override async createSession(input: CreateSessionOptions): Promise<SessionSummary> {
// An explicit id takes the per-session queue so the check-then-create
// below is atomic against another create/close of the same id; a random
// id has no contenders and needs no serialization.
if (input.id !== undefined) {
return this.runSessionAccess(input.id, () => this.doCreateSession(input));
}
return this.doCreateSession(input);
}
private async doCreateSession(input: CreateSessionOptions): Promise<SessionSummary> {
const workDir = normalizeRequiredWorkDir('createSession', input.workDir);
if (input.id !== undefined) {
const existing =
this.liveSession(input.id) ??
(await this.engineAccessor.get(ISessionIndex).get(input.id));
if (existing !== undefined) {
throw new KimiError(
ErrorCodes.SESSION_ALREADY_EXISTS,
`Session "${input.id}" already exists`,
);
}
}
const handle = await this.engineAccessor.get(ISessionManager).create({
sessionId: input.id,
workDir,
additionalDirs: input.additionalDirs,
});
// Wired before the optional main-agent materialization so a profile-bind
// warning (oversized AGENTS.md) reaches the listeners like v1's create.
this.wireSession(handle);
if (
input.model !== undefined ||
input.thinking !== undefined ||
input.permission !== undefined
) {
const agent = await this.materializeMainAgent(handle, {
model: input.model,
thinking: input.thinking,
});
if (input.permission !== undefined) {
agent.accessor.get(IAgentPermissionModeService).setMode(input.permission);
}
}
if (input.metadata !== undefined) {
await this.klient.session(handle.id).update({ custom: { ...input.metadata } });
}
// v1 returns the caller's metadata verbatim on create (not the merged
// custom map a later listing would report), so override it here too.
return { ...(await this.liveSessionSummary(handle)), metadata: input.metadata };
}
/**
* v1 renames through the live session when there is one and at the store
* level otherwise. The v2 metadata service is session-scoped (and the
* klient session facade 404s on a non-live session), so a closed session is
* resumed, renamed, and closed again to land in the same state. The v2
* `setTitle` does no validation, so v1's trim + empty-title rejection lives
* here.
*/
override async renameSession(input: RenameSessionInput): Promise<void> {
const title = input.title.trim();
if (title.length === 0) {
throw new KimiError(ErrorCodes.SESSION_TITLE_EMPTY, 'Session title cannot be empty');
}
await this.runSessionAccess(input.id, () =>
this.withTemporarySession(input.id, () => this.klient.session(input.id).setTitle(title)),
);
}
/**
* v2-only (`ISessionTitleService`, session scope). Like `renameSession`, a
* closed session is resumed, titled, and closed again so generation does
* not leak a live session. `undefined` means generation was unavailable
* (no managed OAuth login, no prompt yet, or a custom title is set) β the
* current title is kept.
*/
override async generateSessionTitle(
input: GenerateSessionTitleInput,
): Promise<string | undefined> {
return this.runSessionAccess(input.id, () =>
this.withTemporarySession(input.id, () =>
this.klient
.session(input.id)
.generateTitle({ force: input.force === true, source: input.source }),
),
);
}
/**
* Through `engineAccessor` (the handler chain's `ISessionLifecycleService.fork`) because the
* klient facade fork takes no explicit target id. `turnIndex` truncation and
* the live-source busy rejection (v1's `SESSION_FORK_ACTIVE_TURN`) are the
* engine's own now, so their failures cross the in-process call with v1's
* codes and details (`request.invalid` with `{turnIndex, availableTurns}` /
* `session.fork_active_turn`). The default title still differs by design
* (v1: "New Session", v2: "Fork: <source>") β pass an explicit title for
* identical results.
*/
override async forkSession(input: ForkSessionInput): Promise<SessionSummary> {
// The source session's reads (metadata, wire flush) stay atomic against
// its close/reload through the per-session queue; an explicit target id
// takes a second (sorted) queue so fork(AβX) is also atomic against
// create(X) / fork(BβX).
return this.runSessionAccessAll(
input.forkId === undefined ? [input.id] : [input.id, input.forkId],
async () => {
try {
const program = await programForSession(this.engineAccessor, input.id);
if (program === undefined) throw SDKRpcClientV2.sessionNotFound(input.id);
const meta = await this.engineAccessor.get(ISessionManager).fork({
sourceSessionId: input.id,
newSessionId: input.forkId,
title: input.title,
metadata: input.metadata,
turnIndex: input.turnIndex,
});
const handle = await resumeSessionById(this.engineAccessor, meta.id);
if (handle === undefined) throw SDKRpcClientV2.sessionNotFound(meta.id);
this.wireSession(handle);
return await this.resumedSessionSummary(handle);
} catch (error) {
throw restateEngineError(error);
}
},
);
}
override async closeSession(input: SessionIdRpcInput): Promise<void> {
await this.runSessionAccess(input.sessionId, () =>
this.klient.session(input.sessionId).close(),
);
}
/**
* Through `engineAccessor` (the handler chain's
* `ISessionLifecycleService.delete`) because the klient facade's
* `session(id).delete()` reports a missing session with its own
* `RPCError(NOT_FOUND)` where v1's store failure is a
* `KimiError(SESSION_NOT_FOUND)` β the pre-check here keeps the v1 shape.
* The engine's delete mirrors v1's order: close the live session first
* (which also drops this client's wiring via the close subscription), then
* remove the session dir, the index entry, and journal the deletion.
*/
override async deleteSession(input: SessionIdRpcInput): Promise<void> {
// Same per-session queue as close/reload: a delete serializes against
// every other lifecycle operation on the session.
return this.runSessionAccess(input.sessionId, async () => {
try {
await this.engineAccessor.get(ISessionManager).delete(input.sessionId);
} catch (error) {
// The session vanished between the index check and the delete: the
// engine's own not-found crosses as an Error2 β restate it in v1's shape.
if (
error instanceof Error &&
(error as { code?: unknown }).code === ErrorCodes.SESSION_NOT_FOUND
) {
throw SDKRpcClientV2.sessionNotFound(input.sessionId);
}
throw error;
}
});
}
/**
* Materializes the session through `engineAccessor`
* (`resumeSessionById` through the handler chain; the facade only offers `restore`,
* which would also clear the archived flag β v1's resume does not).
* `includeSubagents` / `replayTurnLimit` shape the returned per-agent
* snapshot exactly like v1: subagent states are folded best-effort from
* each persisted agent wire, and every agent's replay is trimmed to the
* most recent N user turns via the shared `limitAgentReplayByTurns`.
*/
override async resumeSession(input: ResumeSessionInput): Promise<ResumedSessionSummary> {
// v1 re-resolves caller-provided additional dirs on every resume and
// merges them over the workspace-local set; the engine's resume options
// union them into the handler's shared in-memory set while the session
// scope is materialized. Unlike v1, the v2
// engine has no caller `mcpServers` channel on create/resume (caller
// servers are an ACP-side concern to be designed separately).
return this.runSessionAccess(input.id, async () => {
const handle = await resumeSessionById(this.engineAccessor, input.id, {
additionalDirs: input.additionalDirs,
});
if (handle === undefined) throw SDKRpcClientV2.sessionNotFound(input.id);
this.wireSession(handle);
return this.resumedSessionSummary(handle, {
includeSubagents: input.includeSubagents,
replayTurnLimit: input.replayTurnLimit,
});
});
}
/**
* v1's reload: refuse while a turn runs, re-read config + plugins, close
* the live session, resume from disk. The v2 busy check reads each live
* agent's loop status (turn lane only β background tasks do not block,
* matching v1's `hasActiveTurn`). `forcePluginSessionStartReminder` has no
* v2 channel (the engine owns plugin session-start injection), so reload
* refreshes the durable guidance snapshot through the Agent service.
*/
override async reloadSession(input: ReloadSessionRpcInput): Promise<ResumedSessionSummary> {
const sessionId = input.sessionId;
return this.runSessionAccess(sessionId, async () => {
const live = this.liveSession(sessionId);
if (live !== undefined) {
const agentLifecycle = live.accessor.get(IAgentLifecycleService);
for (const agent of agentLifecycle.list()) {
const agentHandle = agentLifecycle.handleOf(agent.agentId);
if (agentHandle === undefined) continue;
if (agentHandle.accessor.get(IAgentLoopService).snapshot().state === 'running') {
throw new KimiError(
ErrorCodes.TURN_AGENT_BUSY,
`Session "${sessionId}" cannot be reloaded while a turn is running`,
{ details: { sessionId } },
);
}
}
} else if ((await this.engineAccessor.get(ISessionIndex).get(sessionId)) === undefined) {
throw SDKRpcClientV2.sessionNotFound(sessionId);
}
await this.configReady;
await this.klient.global.config.reload();
await this.klient.global.plugins.reload();
await this.refreshPluginSessionStarts(sessionId);
if (live !== undefined) {
await closeSessionById(this.engineAccessor, sessionId);
}
const handle = await resumeSessionById(this.engineAccessor, sessionId);
if (handle === undefined) throw SDKRpcClientV2.sessionNotFound(sessionId);
const main = handle.accessor.get(IAgentLifecycleService).handleOf(MAIN_AGENT_ID);
await main?.accessor.get(IAgentPluginService).refreshSessionStart();
this.wireSession(handle);
return this.resumedSessionSummary(handle);
});
}
private async refreshPluginSessionStarts(excludedSessionId?: string): Promise<void> {
const workspaces = this.engineAccessor.get(IWorkspaceInstanceManager);
await Promise.all(
workspaces.list().map(async (handler) => {
await handler.program.skills.reload();
const sessions = this.engineAccessor
.get(ISessionManager)
.list()
.filter(
(session) => session.accessor.get(ISessionContext).workspaceId === handler.id,
);
await Promise.all(
sessions.map(async (session) => {
if (session.id === excludedSessionId) return;
const main = session.accessor
.get(IAgentLifecycleService)
.handleOf(MAIN_AGENT_ID);
if (main === undefined) return;
await main.accessor.get(IAgentPluginService).refreshSessionStart();
}),
);
}),
);
}
/**
* The base-class contract merges the patch into the session's `custom` map
* (v1 routes through the live session and 404s on a closed one; mirrored
* here by {@link requireLiveSession}).
*/
override async updateSessionMetadata(input: UpdateSessionMetadataRpcInput): Promise<void> {
this.requireLiveSession(input.sessionId);
const current = await this.klient.session(input.sessionId).get();
const custom = { ...current.custom, ...input.metadata };
await this.klient.session(input.sessionId).update({ custom });
}
/**
* Through the session's handler (`IWorkspaceDirs`, workspace scope) β the
* workspace-level add-dir surface: `persist: true` (default) appends to the
* project-local `.kimi-code/local.toml`, `persist: false` joins the
* handler's shared in-memory set. The set is shared by every session of
* the workspace (a v1 `persist: false` dir was session-scoped and written
* into session metadata to survive a resume; the v2 handler keeps it for
* every session of the workspace until the process exits). Returns the
* same `{additionalDirs, projectRoot, configPath, persisted}` shape as v1.
*/
override async addAdditionalDir(input: AddAdditionalDirInput): Promise<AddAdditionalDirResult> {
const handle = this.requireLiveSession(input.id);
const workspaceId = handle.accessor.get(ISessionContext).workspaceId;
const workspace = await this.engineAccessor
.get(IWorkspaceInstanceManager)
.getOrCreate({ workspaceId });
return workspace.program.dirs.addDir({ path: input.path, persist: input.persist });
}
/**
* Through `engineAccessor` (`ISessionExportService`, app scope) β the v2
* port of v1's export: same payload fields, same zip writer layout, same
* live-session flush before the read, and the same
* `SESSION_EXPORT_NOT_FOUND` for a session without an exportable directory.
* Works on closed sessions on both engines (v1 reads the store, v2 the
* index). Gaps, pinned in the migration tracker: v2 additionally validates
* the host `version` (`SESSION_EXPORT_MISSING_VERSION` on blank β v1
* records it unchecked), the manifest's activity timestamps come from v2's
* per-agent wire scan (v1 scans only the root `wire.jsonl`), and the
* manifest carries v2's extra `webLogPath` field (absent unless the host
* passes a web log, which this client never does). The zip ENTRY LIST is
* not part of the parity surface: the two engines lay their session
* directories out differently by design.
*/
override async exportSession(input: ExportSessionInput): Promise<ExportSessionResult> {
return this.engineAccessor.get(ISessionExportService).export({
sessionId: input.id,
outputPath: input.outputPath,
includeGlobalLog: input.includeGlobalLog,
version: input.version,
installSource: input.installSource,
shellEnv: input.shellEnv,
});
}
/**
* Through the session scope (`ISessionSkillCatalog`) β no klient facade
* exists. Same merged view v1's `Session.listSkills` serves (builtin +
* user + project + plugin skills through the same `summarizeSkill`
* mapping), with the same snapshot-vs-live caveat as `listPluginCommands`:
* v1 loads the registry once at session creation while the v2 catalog
* re-merges on source changes mid-session; the two agree for any session
* created after the last skill change.
*/
override async listSkills(input: SessionIdRpcInput): Promise<readonly SkillSummary[]> {
const catalog = this.requireLiveSession(input.sessionId).accessor.get(ISessionSkillCatalog);
await catalog.ready;
return catalog.catalog.listSkills().map(summarizeSkill);
}
// -----------------------------------------------------------------------
// Agent interaction
//
// v1 serves these from the session's eagerly-created main agent, already
// configured with the model/thinking defaults. The v2 engine splits them
// across the klient agent facade (model / permission / plan / context /
// usage / cancel β validated contract calls) and agent-scope services the
// facade does not cover (thinking, compaction, undo, context mutation),
// reached through the live session handle. Every override requires a live
// session (v1's `requireSession`) and resolves the target agent from
// `interactiveAgentId`: the main agent materializes on first use with the
// default profile bound (v1's eager equivalent); any other agent must
// already exist (v1's `AGENT_NOT_FOUND`).
// -----------------------------------------------------------------------
/**
* The session's materialized main agent with v1's eager default binding
* applied: a freshly created agent whose profile is still unbound gets the
* default profile + configured default model (the same bind kap-server's
* prompt route performs on first use). A home with no configured model
* leaves the agent unbound instead of failing β v1's model-less session
* reads (`model: undefined`, `'off'` thinking, zero capabilities) map onto
* the unbound state exactly.
*/
private async materializeMainAgent(
session: ISessionScopeHandle,
binding?: { readonly model?: string; readonly thinking?: string },
): Promise<IAgentScopeHandle> {
await this.modelReady;
const context = await ensureMainAgent(session);
const agent = session.accessor.get(IAgentLifecycleService).handleOf(context.agentId);
if (agent === undefined) {
throw new KimiError(ErrorCodes.AGENT_NOT_FOUND, 'Main agent was not found');
}
const profile = agent.accessor.get(IAgentProfileService);
if (binding !== undefined || profile.data().profileName === undefined) {
try {
await profile.bind({
profile: DEFAULT_AGENT_PROFILE_NAME,
model: binding?.model,
thinking: binding?.thinking,
});
} catch (error) {
if (
binding === undefined &&
error instanceof ProfileError &&
error.code === ProfileErrors.codes.MODEL_NOT_CONFIGURED
) {
return agent;
}
throw error;
}
}
return agent;
}
/** The target agent's live scope handle (see the section header). */
private async agentScope(sessionId: string): Promise<IAgentScopeHandle> {
const session = this.requireLiveSession(sessionId);
const agentId = this.interactiveAgentId;
if (agentId === MAIN_AGENT_ID) return this.materializeMainAgent(session);
const agent = session.accessor.get(IAgentLifecycleService).handleOf(agentId);
if (agent === undefined) {
throw new KimiError(ErrorCodes.AGENT_NOT_FOUND, `Agent "${agentId}" was not found`);
}
return agent;
}
/**
* The klient agent facade for the target agent. The scope is resolved
* first so the main agent exists and carries its default binding before
* the facade call crosses the channel (the channel's own materialization
* leaves the profile unbound).
*/
private async agentFacade(sessionId: string): Promise<AgentHandle> {
await this.agentScope(sessionId);
return this.klient.session(sessionId).agent(this.interactiveAgentId);
}
/**
* Facade (`agentProfileService.setModel`). Both engines resolve the alias
* up front, report the resolved provider name, and reject an unknown alias
* with `config.invalid` (only the trailing message wording differs).
*/
override async setModel(input: SetSessionModelRpcInput): Promise<SetSessionModelRpcResult> {
const agent = await this.agentFacade(input.sessionId);
return agent.setModel(input.model);
}
/**
* Through the agent scope (`IAgentProfileService.setThinking`) β no klient
* facade exists. Same registry-driven strictness as v1's
* `setThinkingEffort`: an unlisted effort on a strict-thinking model
* rejects with `model.config_invalid` and the same message on both
* engines; anything else normalizes through the same resolution.
*/
override async setThinking(input: SetSessionThinkingRpcInput): Promise<void> {
const agent = await this.agentScope(input.sessionId);
agent.accessor.get(IAgentProfileService).setThinking(input.effort);
}
override async setPermission(input: SetSessionPermissionRpcInput): Promise<void> {
const agent = await this.agentFacade(input.sessionId);
return agent.setPermission(input.mode);
}
/** v1 maps the toggle onto two RPCs (`enterPlan` / `cancelPlan`); so does v2. */
override async setPlanMode(input: SetSessionPlanModeRpcInput): Promise<void> {
const agent = await this.agentFacade(input.sessionId);
if (!input.enabled) return agent.cancelPlan();
return agent.enterPlan();
}
override async getPlan(input: SessionIdRpcInput): Promise<SessionPlan> {
const agent = await this.agentFacade(input.sessionId);
return agent.getPlan();
}
override async clearPlan(input: SessionIdRpcInput): Promise<void> {
const agent = await this.agentFacade(input.sessionId);
return agent.clearPlan();
}
/** Facade (`agentCommandService.list`) β the v2-only contributed-command seam. */
override async listCommands(input: SessionIdRpcInput): Promise<readonly AgentCommandInfo[]> {
const agent = await this.agentFacade(input.sessionId);
return agent.listCommands();
}
/** Facade (`agentCommandService.run`) β runs the contribution engine-side. */
override async runCommand(input: RunCommandRpcInput): Promise<void> {
const agent = await this.agentFacade(input.sessionId);
return agent.runCommand({ name: input.name, args: input.args });
}
override async getRuntime(input: SessionIdRpcInput): Promise<AgentRuntimeBinding> {
const agent = await this.agentFacade(input.sessionId);
return agent.getRuntime();
}
override async switchRuntime(input: SwitchSessionRuntimeRpcInput): Promise<AgentRuntimeBinding> {
const agent = await this.agentFacade(input.sessionId);
return agent.switchRuntime(input.runtimeId);
}
/**
* Facade (`getContext`, merged client-side from `agentContextMemoryService.get`
* and `agentTokenCountingService.statusSize`). The v2 `AgentContextData` is the
* same wire shape as v1's β the cast only bridges the two packages' type
* declarations (v2's origin union carries kinds a v1 client never sees in
* practice); the data itself crossed the same JSON boundary on both sides.
* Token-count semantics differ by design: v1 reports the running estimate,
* v2 the provider-measured prefix (`0` until the first LLM round) β pinned
* in the parity KNOWN_DIFFS.
*/
override async getContext(input: SessionIdRpcInput): Promise<AgentContextData> {
const agent = await this.agentFacade(input.sessionId);
return agent.getContext() as Promise<AgentContextData>;
}
override async getUsage(input: SessionIdRpcInput): Promise<SessionUsage> {
const agent = await this.agentFacade(input.sessionId);
return agent.getUsage();
}
/**
* The base class aggregates v1's per-agent `getConfig` / `getContext` /
* `getPermission` / `getPlan` / `getSwarmMode` / `getUsage` RPCs. The v2
* rebuild reads the same six slices: the profile's bound model alias and
* resolved thinking level + capabilities (v1's agent `getConfig` β its
* `provider?.model` fallback is unreachable without an alias), the
* facade's context/plan/usage, and the permission-mode and swarm services.
*/
override async getStatus(input: SessionIdRpcInput): Promise<SessionStatus> {
const agent = await this.agentScope(input.sessionId);
const facade = this.klient.session(input.sessionId).agent(this.interactiveAgentId);
const [context, plan, usage] = await Promise.all([
facade.getContext(),
facade.getPlan(),
facade.getUsage(),
]);
const profile = agent.accessor.get(IAgentProfileService).data();
const capability = profile.modelCapabilities;
const maxContextTokens = capability.max_input_tokens ?? capability.max_context_tokens;
const contextTokens = context.tokenCount;
// Deliberately unclamped, same as the base class (>100% is the documented
// overflow signal on this path).
const contextUsage = maxContextTokens > 0 ? contextTokens / maxContextTokens : 0;
const hasUsage =
usage.byModel !== undefined || usage.total !== undefined || usage.currentTurn !== undefined;
return {
model: profile.modelAlias,
thinkingEffort: profile.thinkingLevel,
permission: agent.accessor.get(IAgentPermissionModeService).mode,
planMode: plan !== null,
swarmMode: agent.accessor.get(IAgentSwarmService).isActive,
towerMode: agent.accessor.get(IAgentTowerService).isActive,
contextTokens,
maxContextTokens,
contextUsage,
usage: hasUsage ? usage : undefined,
};
}
/**
* Facade (`agentLoopService.cancelFromUser`) plus the session-level init
* run: v1's cancel cascades from the agent's turn to every foreground
* subagent run of the session, and /init is the one session-level run v2
* keeps off the agent turn lane β its abort controller lives in
* `ISessionInitService` (a silent no-op when no init is running).
*/
override async cancel(input: SessionIdRpcInput): Promise<void> {
const session = this.requireLiveSession(input.sessionId);
session.accessor.get(ISessionInitService).cancelInit();
const agent = await this.agentFacade(input.sessionId);
return agent.cancel();
}
/**
* Through the agent scope (`IAgentFullCompactionService.begin`) β no klient
* facade exists. Same semantics as v1's `beginCompaction`: a manual
* compaction launches the summarizer immediately in the background, is a
* silent no-op while one is already running, and rejects with
* `compaction.unable` on an empty history or an active turn.
*/
override async compact(input: SessionIdRpcInput & CompactOptions): Promise<void> {
const agent = await this.agentScope(input.sessionId);
agent.accessor.get(IAgentFullCompactionService).begin({
source: 'manual',
instruction: input.instruction,
});
}
/**
* Through the agent scope (`IAgentFullCompactionService.cancel`) β no
* klient facade exists. Aborts the in-flight compaction; a no-op when idle,
* like v1.
*/
override async cancelCompaction(input: SessionIdRpcInput): Promise<void> {
const agent = await this.agentScope(input.sessionId);
agent.accessor.get(IAgentFullCompactionService).cancel();
}
/**
* Through the agent scope (`IAgentConversationUndoService.undo`) β no
* klient facade exists; the returned count is
* dropped (v1 returns void). Failure semantics differ by design: v2
* prechecks and rejects atomically with `session.undo_unavailable`, while
* v1 splices a partial suffix out of the live history and then throws
* `request.invalid` β pinned in the parity KNOWN_DIFFS.
*/
override async getTodos(input: SessionIdRpcInput): Promise<readonly SessionTodoItem[]> {
const session = this.requireLiveSession(input.sessionId);
const agents = session.accessor.get(IAgentLifecycleService);
const main = agents.handleOf(MAIN_AGENT_ID);
if (main === undefined) return [];
const todos = main.accessor.get(IAgentTodoService).get();
return todos.map((todo) => ({ title: todo.title, status: todo.status }));
}
override async undoHistory(input: SessionIdRpcInput & { count: number }): Promise<void> {
const agent = await this.agentScope(input.sessionId);
await agent.accessor.get(IAgentConversationUndoService).undo(input.count);
}
/**
* Through the agent scope (`IAgentContextMemoryService.clear`) β no klient
* facade exists. v1's `context.clear` has no busy check and does not touch
* queued or running prompts; the memory-service clear matches that exactly
* (the prompt service's own `clear` would additionally abort prompts).
*/
override async clearContext(input: SessionIdRpcInput): Promise<void> {
const agent = await this.agentScope(input.sessionId);
agent.accessor.get(IAgentContextMemoryService).clear();
}
/**
* No v2 engine capability exists for import-context (nothing under
* agent-core-v2 builds this message), so the SDK composes v1's exact
* behavior over v2 primitives: the same busy rejection
* (`turn.agent_busy`), the byte-identical import message and validations
* (`src/v2/import-context.ts`), the same overflow gate, then the same wire
* `context.append_message` Op v1 persists. Known gap: v1 also adopts the
* post-import estimate as its reported token count, while v2's reported
* count is provider-measured and has no public setter β post-import
* `getContext().tokenCount` diverges (pinned in the parity KNOWN_DIFFS).
*/
override async importContext(input: ImportContextRpcInput): Promise<void> {
const agent = await this.agentScope(input.sessionId);
if (
agent.accessor.get(IAgentLoopService).snapshot().state === 'running' ||
agent.accessor.get(IAgentFullCompactionService).compacting !== null
) {
throw new KimiError(
ErrorCodes.TURN_AGENT_BUSY,
'Cannot import context while the agent is busy',
);
}
const message = buildImportContextMessage(input.content, input.source);
const capability = agent.accessor.get(IAgentProfileService).data().modelCapabilities;
const currentTokenCount = agent.accessor
.get(ISessionTokenCountingService)
.get(agentContextOf(agent)).size;
assertImportFits(
message,
currentTokenCount,
capability.max_input_tokens ?? capability.max_context_tokens,
);
agent.accessor.get(IAgentContextMemoryService).append(message);
}
/**
* Facade (`agentPromptService.submit`). The launch result (`{turn_id}`, or
* `undefined` when the prompt queued behind a running turn) is dropped β
* v1's RPC returns void. The pre-provider surface matches v1: the metadata
* update (title/lastPrompt) runs through the same shared helpers before the
* turn launches, and a model-less turn fails asynchronously exactly like
* v1's. One enqueue-semantics gap vs v1, pinned in the migration tracker:
* v1 drops a prompt submitted while a turn is active (error event only)
* where v2 queues it FIFO.
*/
override async prompt(input: SessionPromptRpcInput): Promise<void> {
const agent = await this.agentFacade(input.sessionId);
await agent.prompt({
input: input.input,
promptId: input.promptId,
});
}
/**
* Facade (`agentSkillService.promptWithSkills`) β bundled skill submission:
* the engine renders every skill activation into the prompt's own user
* message, so the bundle launches as one turn and undoes as a single
* anchor. v2-only: the base class rejects this method on the v1 engine.
* The launch result is dropped like `prompt` (v1's RPC shape returns void).
*/
override async promptWithSkills(input: SessionPromptWithSkillsRpcInput): Promise<void> {
const agent = await this.agentFacade(input.sessionId);
await agent.promptWithSkills({
input: input.input,
skills: input.skills,
});
}
/**
* Facade (`agentPromptService.submitSteer`). Matches v1 on both paths: mid-turn
* steers join the running turn, and an idle-session steer degrades to
* launching a fresh turn (the enqueue launches it directly) while
* title/lastPrompt are updated like a prompt's.
*/
override async steer(input: SessionPromptRpcInput): Promise<void> {
const agent = await this.agentFacade(input.sessionId);
await agent.steer({ input: input.input });
}
/**
* Facade (`agentShellCommandService.run`) β the same builtin-Bash execution
* and `shell_command`-origin history records as v1, with an identical
* `{stdout, stderr, isError?, backgrounded?}` result shape. The `commandId`
* event stream (`shell.output` / `shell.started` / `shell.completed`) is
* engine-side on both; translating it into SDK events is the event batch's
* job, not this one's. Model-less gap, not pinned: v1's builtin tools only
* exist on a profiled agent, so a model-less v1 session answers "Bash tool
* is not available." where v2 runs the command.
*/
override async runShellCommand(input: {
sessionId: string;
command: string;
commandId?: string;
}): Promise<{ stdout: string; stderr: string; isError?: boolean; backgrounded?: boolean }> {
const agent = await this.agentFacade(input.sessionId);
return agent.runShellCommand({ command: input.command, commandId: input.commandId });
}
/** Facade (`agentShellCommandService.cancel`) β an unknown id is a silent no-op on both engines. */
override async cancelShellCommand(input: {
sessionId: string;
commandId: string;
}): Promise<void> {
const agent = await this.agentFacade(input.sessionId);
return agent.cancelShellCommand({ commandId: input.commandId });
}
/**
* Through the target agent's `IAgentSkillService` β the direct call
* keeps v1's semantics: validate first (`skill.not_found` /
* `skill.type_unsupported` reject synchronously), then render the skill
* prompt and launch a turn with it. The engine updates title/lastPrompt for
* the MAIN agent only, matching v1's session layer. Busy-turn behavior now
* matches v1 too: the activation steers into the running turn at the next
* step boundary (v1's `SkillManager.recordActivation` steer; v2 queues a
* fresh prompt turn only when idle).
*/
override async activateSkill(input: ActivateSkillRpcInput): Promise<void> {
const agent = await this.agentScope(input.sessionId);
await agent.accessor
.get(IAgentSkillService)
.activate({ name: input.name, args: input.args });
}
/**
* Through the agent scope (`IAgentPluginCommandService.activate`): the same
* `request.invalid` rejection text for an unknown command, the same
* argument expansion, the activation event, the prompt enqueue, and the
* main-agent-only metadata update. Two gaps vs v1,
* pinned in the migration tracker: v1 resolves the command against the
* session's creation-time snapshot (v2 uses the app-global live view), and
* v1 drops the activation while a turn runs where v2 queues it.
*/
override async activatePluginCommand(input: ActivatePluginCommandRpcInput): Promise<void> {
const agent = await this.agentScope(input.sessionId);
await agent.accessor.get(IAgentPluginCommandService).activate({
pluginId: input.pluginId,
commandName: input.commandName,
args: input.args,
});
}
/**
* Through the session scope (`ISessionInitService.generateAgentsMd`, the
* engine's port of v1's `Session.generateAgentsMd`) β a session-level
* operation pinned to the main agent on both engines, so
* `interactiveAgentId` does not apply; the main agent is materialized first
* (v1 creates it eagerly at createSession). The success path is a real
* subagent LLM round (`/init` brief), so parity covers only the model-less
* rejection: both engines fail with `session.init_failed`, with different
* messages (v1 wraps the provider-resolution failure, v2 preflights the
* missing binding) β pinned in the parity tests.
*/
override async generateAgentsMd(input: SessionIdRpcInput): Promise<void> {
const session = this.requireLiveSession(input.sessionId);
await this.materializeMainAgent(session);
await session.accessor.get(ISessionInitService).generateAgentsMd();
}
/**
* No v2 service implements the session-warnings aggregate, so the SDK rebuilds v1's
* `Session.getSessionWarnings` over v2 primitives: the profile's cached
* `agentsMdWarning` (computed on every bind, v1's bootstrap-time cache),
* recomputed through the engine's own `prepareSystemPromptContext` when the
* cache is empty β v1 recomputes on demand whenever no warning is cached,
* so an AGENTS.md that outgrows the budget mid-session surfaces on both
* engines. The single warning shape (`agents-md-oversized`, severity
* `warning`) mirrors v1's assembly.
*/
override async getSessionWarnings(input: SessionIdRpcInput) {
const agent = await this.agentScope(input.sessionId);
let warning = agent.accessor.get(IAgentProfileService).getAgentsMdWarning();
if (warning === undefined) {
const session = this.requireLiveSession(input.sessionId);
const prepared = await prepareSystemPromptContext(
{
fs: this.engineAccessor.get(IHostFileSystem),
homeDir: this.engineAccessor.get(IHostEnvironment).homeDir,
},
session.accessor.get(ISessionContext).cwd,
this.engineAccessor.get(IBootstrapService).homeDir,
{ additionalDirs: session.accessor.get(ISessionWorkspaceContext).additionalDirs },
);
warning = prepared.agentsMdWarning;
}
return warning === undefined
? []
: [{ code: 'agents-md-oversized', message: warning, severity: 'warning' as const }];
}
/**
* Through the session scope (`ISessionBtwService`) β no klient facade
* exists. The v2 service is the port of v1's btw fork: same inherited
* profile/context, same byte-identical side-question reminder, same
* tool-call deny, and the same return (the forked child's agent id). The
* main agent is materialized first β both engines fork it as the source,
* and v2's `fork('main')` throws on a missing source. Gaps, pinned in the
* migration tracker: v2 always forks MAIN where v1 forks the agent
* `interactiveAgentId` addresses (SDK hosts only ever btw the main agent),
* and the v2 child is a regular persisted agent where v1's is memory-only
* (`InMemoryAgentRecordPersistence`, no metadata).
*/
override async startBtw(input: SessionIdRpcInput): Promise<string> {
const session = this.requireLiveSession(input.sessionId);
await this.materializeMainAgent(session);
return session.accessor.get(ISessionBtwService).start();
}
/**
* Through the agent scope (`IAgentSwarmService.enter` / `.exit`) β no
* klient facade exists. The v2 service is the port of v1's `SwarmMode`:
* enter is idempotent and injects the byte-identical enter reminder for
* non-`tool` triggers, exit pops that reminder when it is the last message
* (appending the exit reminder otherwise), and `task` / `tool` triggers
* auto-exit on turn end. The base class's private enter/exit pair is
* replaced wholesale; `swarm()` below recomposes it over this override.
*/
override async setSwarmMode(input: SetSessionSwarmModeRpcInput): Promise<void> {
const agent = await this.agentScope(input.sessionId);
const swarm = agent.accessor.get(IAgentSwarmService);
if (input.enabled) {
swarm.enter(input.trigger);
} else {
swarm.exit();
}
await agent.accessor.get(IAgentReminderService).reconcileWhenIdle('swarm_mode');
}
/** v1's `swarm()` composition: enter with the one-shot `task` trigger, then prompt. */
override async swarm(input: SessionPromptRpcInput): Promise<void> {
await this.setSwarmMode({ sessionId: input.sessionId, enabled: true, trigger: 'task' });
return this.prompt(input);
}
/** Through the agent scope (`IAgentTowerService.enter` / `.exit`) β no klient facade exists. */
override async setTowerMode(input: SetSessionTowerModeRpcInput): Promise<void> {
const agent = await this.agentScope(input.sessionId);
const tower = agent.accessor.get(IAgentTowerService);
if (input.enabled) {
const result = await tower.enter(input.base);
if (!result.entered) {
throw new V2Error2(
V2ErrorCodes.SESSION_TOWER_MODE_INVALID,
towerEnterFailureMessage(result),
);
}
} else {
await tower.exit();
}
await agent.accessor.get(IAgentReminderService).reconcileWhenIdle('tower_mode');
}
// -----------------------------------------------------------------------
// Goal / cron / background tasks / print policy
//
// The goal service is the v2 port of v1's `GoalMode` (same state machine,
// same validations, same error codes), so the goal overrides are thin
// forwards through the agent scope. Cron and the task manager moved from
// per-agent (v1) to session/agent-scope services with field-identical
// wire shapes; the two print-policy methods have no v2 service at all
// (the native v2 print runner re-implements the same policy inline), so
// they are rebuilt here over the engine's config helpers and the session's
// per-agent task services.
// -----------------------------------------------------------------------
/**
* Through the target agent scope's `IAgentGoalService` β no klient
* facade exists for the goal domain. Gap: v2 rejects every goal command on
* a non-main agent (`goal.unsupported_agent`) where v1 keeps a `GoalMode`
* on every agent; only reachable through a non-main `interactiveAgentId`
* (tracked in the migration tracker).
*/
override async createGoal(input: SessionIdRpcInput & CreateGoalInput): Promise<GoalSnapshot> {
const agent = await this.agentScope(input.sessionId);
return agent.accessor
.get(IAgentGoalService)
.createGoal({ objective: input.objective, replace: input.replace });
}
override async getGoal(input: SessionIdRpcInput): Promise<GoalToolResult> {
const agent = await this.agentScope(input.sessionId);
return agent.accessor.get(IAgentGoalService).getGoal();
}
override async pauseGoal(input: SessionIdRpcInput): Promise<GoalSnapshot> {
const agent = await this.agentScope(input.sessionId);
return agent.accessor.get(IAgentGoalService).pauseGoal();
}
override async resumeGoal(input: SessionIdRpcInput): Promise<GoalSnapshot> {
const agent = await this.agentScope(input.sessionId);
return agent.accessor.get(IAgentGoalService).resumeGoal();
}
override async cancelGoal(input: SessionIdRpcInput): Promise<GoalSnapshot> {
const agent = await this.agentScope(input.sessionId);
return agent.accessor.get(IAgentGoalService).cancelGoal();
}
/**
* Through the main agent's `IAgentCronService` β no klient facade
* exists for cron. v1's cron manager is per-agent: the main agent's
* manager is what the v2 cron service ports (it borrows the main
* agent to steer fires), and a v1 subagent reports `[]` (`cron` is null) β
* mirrored here for a non-main `interactiveAgentId`. The v1 snapshot shape
* is restored field-by-field: `recurring` defaults to true, and the
* post-jitter `nextFireAt` comes from the same scheduler read v1's
* `listTaskSnapshots` forwards to.
*/
override async getCronTasks(input: SessionIdRpcInput): Promise<GetCronTasksResult> {
await this.agentScope(input.sessionId);
if (this.interactiveAgentId !== MAIN_AGENT_ID) return { tasks: [] };
const session = this.requireLiveSession(input.sessionId);
const main = session.accessor.get(IAgentLifecycleService).handleOf(MAIN_AGENT_ID);
if (main === undefined) return { tasks: [] };
const cron = main.accessor.get(IAgentCronService);
return {
tasks: cron.list().map((task) => ({
id: task.id,
cron: task.cron,
recurring: task.recurring !== false,
createdAt: task.createdAt,
lastFiredAt: task.lastFiredAt,
nextFireAt: cron.getNextFireForTask(task.id),
})),
};
}
/**
* Facade (`agentTaskService.list`). The v2 `AgentTaskInfo` union is the
* same wire shape as v1's `BackgroundTaskInfo` β the process / agent /
* question kinds are field-identical ports β so the cast only bridges the
* two packages' type declarations. One content gap, pinned in the parity
* KNOWN_DIFFS: after a detach, v2 rewrites the reported `timeoutMs` to the
* detach deadline where v1 keeps the foreground one.
*/
override async listBackgroundTasks(
input: SessionIdRpcInput & { activeOnly?: boolean; limit?: number },
): Promise<readonly BackgroundTaskInfo[]> {
const agent = await this.agentFacade(input.sessionId);
return agent.getTasks({ activeOnly: input.activeOnly, limit: input.limit }) as Promise<
readonly BackgroundTaskInfo[]
>;
}
/**
* Facade (`agentTaskService.readOutput`) β same unknown-id-returns-`''`
* behavior and the same trailing-characters `tail` semantics as v1.
*/
override async getBackgroundTaskOutput(
input: SessionIdRpcInput & { taskId: string; tail?: number },
): Promise<string> {
const agent = await this.agentFacade(input.sessionId);
return agent.getTaskOutput({ taskId: input.taskId, tail: input.tail });
}
/**
* Through the agent scope (`IAgentTaskService.stop`) β deliberately NOT the
* facade's `stopTask`, whose no-reason path routes to `stopByUser` and
* stamps a user-cancellation `stopReason` where v1's
* `background.stop(taskId, reason)` records none. The direct call matches
* v1 in both shapes (reason trimmed, blank β undefined). Timing gap: v1
* fire-and-forgets the stop so its RPC returns before the kill settles;
* the v2 service awaits the termination β a strictly stronger guarantee.
*/
override async stopBackgroundTask(
input: SessionIdRpcInput & { taskId: string; reason?: string },
): Promise<void> {
const agent = await this.agentScope(input.sessionId);
await agent.accessor.get(IAgentTaskService).stop(input.taskId, input.reason);
}
/**
* Through the agent scope (`IAgentTaskService.detach`) β no klient facade
* exists. Same semantics as v1's `background.detach`: releases the
* foreground tool-call waiter, returns the live info (or the ghost / live
* info for an already-terminal task, `undefined` for an unknown id).
*/
override async detachBackgroundTask(
input: SessionIdRpcInput & { taskId: string },
): Promise<BackgroundTaskInfo | undefined> {
const agent = await this.agentScope(input.sessionId);
return agent.accessor.get(IAgentTaskService).detach(input.taskId) as
| BackgroundTaskInfo
| undefined;
}
/**
* v1's `Session.waitForBackgroundTasksOnPrint`, rebuilt over v2 primitives
* β no v2 service owns the print policy (the native v2 print runner
* re-implements the same drain inline in run-v2-print). Same gate (drain
* mode only), same ceiling, same suppress + wait + re-enumerate loop over
* every live agent's task service. Config timing note: v1 reads the
* `background` section captured at session creation; v2 resolves the live
* config (the `[task]` section layered over `[background]`) β identical
* unless the config changes mid-session.
*/
override async waitForBackgroundTasksOnPrint(input: SessionIdRpcInput): Promise<void> {
const session = this.requireLiveSession(input.sessionId);
await this.configReady;
const config = this.engineAccessor.get(IConfigService);
if (resolvePrintBackgroundMode(config) !== 'drain') return;
const ceilingS =
resolveAgentTaskConfig(config)?.printWaitCeilingS ?? PRINT_WAIT_CEILING_S_DEFAULT;
await this.drainBackgroundTasksOnPrint(session, ceilingS);
}
/**
* v1's `Session.handlePrintMainTurnCompleted`, rebuilt over the same v2
* primitives: `'exit'` finishes immediately, `'drain'` drains then
* finishes, and `'steer'` keeps the run alive while background tasks are
* pending, bounded by the wall-clock ceiling (`print_wait_ceiling_s`) and
* the turn cap (`print_max_turns`). The steer deadline/turn counters are
* per-session SDK state ({@link printSteerStates}), mirroring v1's
* Session-object fields.
*/
override async handlePrintMainTurnCompleted(
input: SessionIdRpcInput,
): Promise<'finish' | 'continue'> {
const session = this.requireLiveSession(input.sessionId);
await this.configReady;
const config = this.engineAccessor.get(IConfigService);
const taskConfig = resolveAgentTaskConfig(config);
const ceilingS = taskConfig?.printWaitCeilingS ?? PRINT_WAIT_CEILING_S_DEFAULT;
const mode = resolvePrintBackgroundMode(config);
if (mode === 'exit') return 'finish';
if (mode === 'drain') {
await this.drainBackgroundTasksOnPrint(session, ceilingS);
return 'finish';
}
// 'steer'
const maxTurns = taskConfig?.printMaxTurns ?? PRINT_MAX_TURNS_DEFAULT;
const state = this.printSteerStates.get(input.sessionId) ?? { deadline: undefined, turns: 0 };
this.printSteerStates.set(input.sessionId, state);
const now = Date.now();
state.deadline ??= now + ceilingS * 1000;
state.turns += 1;
if (now >= state.deadline) return 'finish';
if (state.turns > maxTurns) return 'finish';
if (this.countActiveBackgroundTasks(session) > 0) return 'continue';
return 'finish';
}
/**
* The shared drain pass of the two print-policy overrides, ported from
* v1's `waitForBackgroundTasksOnPrint` (the native v2 print runner carries
* the same loop): re-enumerate active tasks across every live agent until
* none remain or the ceiling expires β a subagent may fan out new tasks
* mid-drain β with terminal notifications suppressed up front so a
* completing task cannot steer a finished main turn.
*/
private async drainBackgroundTasksOnPrint(
session: ISessionScopeHandle,
ceilingS: number,
): Promise<void> {
const deadline = Date.now() + ceilingS * 1000;
const seen = new Set<string>();
const allWaiters: Promise<unknown>[] = [];
while (Date.now() < deadline) {
const batch: Promise<unknown>[] = [];
const suppressions: Promise<void>[] = [];
let activeCount = 0;
const agentLifecycle = session.accessor.get(IAgentLifecycleService);
for (const agent of agentLifecycle.list()) {
const agentHandle = agentLifecycle.handleOf(agent.agentId);
if (agentHandle === undefined) continue;
const tasks = agentHandle.accessor.get(IAgentTaskService);
for (const task of tasks.list(true)) {
activeCount++;
if (seen.has(task.taskId)) continue;
seen.add(task.taskId);
suppressions.push(tasks.suppressTerminalNotification(task.taskId));
// A configured ceiling above the ~24.8-day timer ceiling overflows
// a raw `setTimeout` into an immediate resolve β clamp here (the
// engine's `wait` clamps too; this keeps the caller side correct
// regardless). The outer loop re-enumerates after an early return,
// so semantics are unchanged.
const remaining = Math.min(Math.max(1, deadline - Date.now()), MAX_TIMER_DELAY_MS);
const waiter = tasks.wait(task.taskId, remaining);
batch.push(waiter);
allWaiters.push(waiter);
}
}
if (suppressions.length > 0) await Promise.all(suppressions);
if (activeCount === 0 || batch.length === 0) break;
await Promise.all(batch);
}
if (allWaiters.length > 0) await Promise.all(allWaiters);
}
/** v1's `countActiveBackgroundTasks`: active tasks across every live agent. */
private countActiveBackgroundTasks(session: ISessionScopeHandle): number {
let count = 0;
const agentLifecycle = session.accessor.get(IAgentLifecycleService);
for (const agent of agentLifecycle.list()) {
const agentHandle = agentLifecycle.handleOf(agent.agentId);
if (agentHandle === undefined) continue;
count += agentHandle.accessor.get(IAgentTaskService).list(true).length;
}
return count;
}
// -----------------------------------------------------------------------
// MCP: the management plane (user-global CRUD, the standalone probe, the
// locator-addressed inspection catalog, OAuth flows) delegates to the
// engine's App-scope `IMcpManagementService`; the session-level reads go
// through the session scope's seeded `ISessionMcpHandle` (no klient facade
// exists for either group).
// -----------------------------------------------------------------------
/**
* The engine's management plane throws `Error2`; the SDK's public error
* contract is `KimiError` (what `isKimiError` branches on, and what the v1
* client throws for the same failures). Restate so both engines surface
* the identical class β see `restateEngineError`.
*/
private async mcpManagement<T>(
call: (management: IMcpManagementService) => Promise<T>,
): Promise<T> {
try {
return await call(this.engineAccessor.get(IMcpManagementService));
} catch (error) {
throw restateEngineError(error);
}
}
override async listGlobalMcpServers(
options: { readonly cwd?: string } = {},
): Promise<readonly McpManagedServerInfo[]> {
const servers = await this.mcpManagement((management) =>
management.listServers({ cwd: options.cwd }),
);
return servers.map(toManagedServerInfo);
}
override async getGlobalMcpServer(
name: string,
options: { readonly cwd?: string } = {},
): Promise<McpManagedServerInfo> {
const server = await this.mcpManagement((management) =>
management.getServer(name, { cwd: options.cwd }),
);
return toManagedServerInfo(server);
}
override async listGlobalMcpServerAuthStatuses(
options: { readonly cwd?: string; readonly verify?: boolean } = {},
): Promise<readonly GlobalMcpServerAuthStatus[]> {
const statuses = await this.mcpManagement((management) =>
management.listAuthStatuses({ cwd: options.cwd, verify: options.verify }),
);
// The legacy surface never reports `unavailable` (no ambiguity check
// here), so the engine's wider state union narrows to the v1 wire one.
return statuses as readonly GlobalMcpServerAuthStatus[];
}
override async inspectAppMcpServers(
targets?: readonly McpServerLocator[],
options: { readonly cwd?: string } = {},
): Promise<readonly AppMcpServerInspection[]> {
const inspections = await this.mcpManagement((management) =>
management.inspectServers(targets, { cwd: options.cwd }),
);
// Field-identical with the v1 wire shape (the engines' locator /
// config-view / auth-state declarations match structurally).
return inspections as readonly AppMcpServerInspection[];
}
override async addGlobalMcpServer(
server: McpServerConfig,
options: { readonly cwd?: string } = {},
): Promise<readonly McpManagedServerInfo[]> {
const servers = await this.mcpManagement((management) =>
management.addServer(server, { cwd: options.cwd }),
);
return servers.map(toManagedServerInfo);
}
override async updateGlobalMcpServer(
server: McpServerConfig,
options: { readonly cwd?: string } = {},
): Promise<readonly McpManagedServerInfo[]> {
const servers = await this.mcpManagement((management) =>
management.updateServer(server, { cwd: options.cwd }),
);
return servers.map(toManagedServerInfo);
}
override async removeGlobalMcpServer(
name: string,
options: { readonly cwd?: string } = {},
): Promise<readonly McpManagedServerInfo[]> {
const servers = await this.mcpManagement((management) =>
management.removeServer(name, { cwd: options.cwd }),
);
return servers.map(toManagedServerInfo);
}
/**
* The legacy name-only entry point resolves its locator first: exactly one
* enabled entry may own the runtime name, so a global/plugin collision
* rejects instead of guessing which credential the flow acts on.
*/
override async beginGlobalMcpServerAuth(
name: string,
options: { readonly cwd?: string } = {},
): Promise<BeginGlobalMcpServerAuthResult> {
return this.mcpManagement(async (management) => {
const query = { cwd: options.cwd };
return management.beginServerAuth(await management.resolveServerByName(name, query), query);
});
}
override async beginMcpServerAuth(
locator: McpServerLocator,
options: { readonly cwd?: string } = {},
): Promise<BeginGlobalMcpServerAuthResult> {
return this.mcpManagement((management) =>
management.beginServerAuth(locator, { cwd: options.cwd }),
);
}
override async completeGlobalMcpServerAuth(
input: {
readonly flowId: string;
readonly timeoutMs?: number;
},
signal?: AbortSignal,
): Promise<void> {
return this.completeMcpServerAuth(input, signal);
}
override async completeMcpServerAuth(
input: {
readonly flowId: string;
readonly timeoutMs?: number;
},
signal?: AbortSignal,
): Promise<void> {
return this.mcpManagement((management) =>
management.completeServerAuth(input, { signal }),
);
}
override async cancelGlobalMcpServerAuth(flowId: string): Promise<void> {
return this.cancelMcpServerAuth(flowId);
}
override async cancelMcpServerAuth(flowId: string): Promise<void> {
return this.mcpManagement((management) => management.cancelServerAuth({ flowId }));
}
override async resetGlobalMcpServerAuth(
name: string,
options: { readonly cwd?: string } = {},
): Promise<void> {
return this.mcpManagement(async (management) => {
const query = { cwd: options.cwd };
return management.resetServerAuth(await management.resolveServerByName(name, query), query);
});
}
override async resetMcpServerAuth(
locator: McpServerLocator,
options: { readonly cwd?: string } = {},
): Promise<void> {
return this.mcpManagement((management) =>
management.resetServerAuth(locator, { cwd: options.cwd }),
);
}
override async testGlobalMcpServer(
name: string,
options: { readonly cwd?: string } = {},
): Promise<McpTestResult> {
return this.mcpManagement((management) =>
management.testServer({ name, cwd: options.cwd }),
);
}
/**
* The inline-config channel of v1's `testGlobalMcpServer`: the same
* schema-validated, unsaved probe β nothing has to be persisted first.
*/
override async testGlobalMcpServerConfig(
server: McpServerConfig,
options: { readonly cwd?: string } = {},
): Promise<McpTestResult> {
return this.mcpManagement((management) =>
management.testServer({ server, cwd: options.cwd }),
);
}
/**
* Through the session scope (the seeded `ISessionMcpHandle.connectionManager`
* β the workspace handler's one shared manager). This is a live snapshot:
* create/resume no longer waits for MCP startup, so entries may still be
* pending. The v2 `McpServerEntry` is field-identical with v1's
* `McpServerInfo` (the cast bridges the two packages' type declarations).
*/
override async listMcpServers(input: SessionIdRpcInput): Promise<readonly McpServerInfo[]> {
const mcp = this.requireLiveSession(input.sessionId).accessor.get(ISessionMcpHandle);
return mcp.connectionManager.list() as readonly McpServerInfo[];
}
/**
* Workspace-level MCP view (the handler's one shared connection set), so
* `/mcp` is inspectable on a v2 session-less startup before any session
* exists. Awaits `ready` so a fresh handler's initial connect settles
* before the list is read.
* Same `McpServerEntry`-as-`McpServerInfo` cast as listMcpServers.
*/
override async listWorkspaceMcpServers(workDir: string): Promise<readonly McpServerInfo[]> {
const handler = await this.engineAccessor
.get(IWorkspaceInstanceManager)
.getOrCreate({ root: normalizeRequiredWorkDir('listWorkspaceMcpServers', workDir) });
const mcp = handler.program.mcp;
await mcp.ready;
return mcp.connectionManager().list() as readonly McpServerInfo[];
}
override async getMcpStartupMetrics(input: SessionIdRpcInput): Promise<McpStartupMetrics> {
const mcp = this.requireLiveSession(input.sessionId).accessor.get(ISessionMcpHandle);
await mcp.ready;
return { durationMs: mcp.connectionManager.initialLoadDurationMs() };
}
/**
* Same direct `reconnect` as v1's session RPC β the v2 manager raises the
* same `mcp.server_not_found` / `mcp.server_disabled` errors, and the tool
* re-registration rides on the status listeners in both engines. The
* "name + full config" channel rides the manager's upserting `connect`
* (validated exactly like v1's session RPC), which only exists on a plain
* manager β a session created with ephemeral MCP servers holds a merged
* view instead and rejects loudly.
*/
override async reconnectMcpServer(input: ReconnectMcpServerRpcInput): Promise<void> {
const mcp = this.requireLiveSession(input.sessionId).accessor.get(ISessionMcpHandle);
if (input.config === undefined) {
await mcp.connectionManager.reconnect(input.name);
return;
}
const manager = mcp.connectionManager;
if (!(manager instanceof McpConnectionManager)) {
throw new KimiError(
ErrorCodes.NOT_IMPLEMENTED,
'reconnectMcpServer with an explicit config is not supported for v2 sessions with ephemeral MCP servers',
);
}
const replacement = parseReconnectMcpServerConfig(input.name, input.config);
// Parity with v1's manager reconnect: a disabled replacement is rejected
// before anything is applied, not upserted over the live connection.
if (replacement.enabled === false) {
throw new KimiError(
ErrorCodes.MCP_SERVER_DISABLED,
`MCP server is disabled: ${input.name}`,
);
}
await manager.connect(input.name, replacement);
}
/**
* v1's `addSessionMcpServer` over the session scope's connection manager:
* validate, optionally persist to the user-level file, then upsert through
* `connect`. Two accepted gaps against v1: the v2 entry carries no
* `source`/`config` tags (the manager does not track origins), and the one
* shared manager per workspace handler makes an unpersisted add visible to
* sibling sessions of the same workspace. The same merged-view limitation
* as {@link reconnectMcpServer} applies.
*/
override async addSessionMcpServer(input: {
readonly sessionId: string;
readonly server: McpServerConfig;
readonly persist?: boolean;
}): Promise<McpServerInfo> {
const session = this.requireLiveSession(input.sessionId);
const mcp = session.accessor.get(ISessionMcpHandle);
const manager = mcp.connectionManager;
if (!(manager instanceof McpConnectionManager)) {
throw new KimiError(
ErrorCodes.NOT_IMPLEMENTED,
'addSessionMcpServer is not supported for v2 sessions with ephemeral MCP servers',
);
}
const parsed = parseInlineMcpServer(input.server);
// The store trims names; keep the manager entry and the persisted key on
// the same normalized identity, like v1's addSessionMcpServer does.
const target = { ...parsed, name: normalizeServerName(parsed.name) };
if (input.persist === true) {
const cwd = session.accessor.get(ISessionWorkspaceContext).workDir;
await this.rejectProjectLayerPersistedMcpAdd(cwd, target.name);
await this.mcpManagement((management) => management.addServer(target, { cwd }));
}
await manager.connect(target.name, mcpConfigWithoutName(target));
const entry = manager.get(target.name);
if (entry === undefined) {
throw new KimiError(
ErrorCodes.MCP_SERVER_NOT_FOUND,
`MCP server "${target.name}" was not connected`,
);
}
return entry as McpServerInfo;
}
}
export function createKimiHarness(options: KimiHarnessOptions): KimiHarness {
const rpc = new SDKRpcClientV2(options);
rpc.suppressEngineSessionStarted();
return new KimiHarness(rpc, {
identity: rpc.identity,
uiMode: options.uiMode,
homeDir: rpc.homeDir,
configPath: rpc.configPath,
auth: rpc.auth,
telemetry: rpc.telemetry,
ensureConfigFile: () => rpc.ensureConfigFile(),
onClose: () => rpc.close(),
imageLimits: undefined,
sessionStartedProperties: options.sessionStartedProperties,
sessionStartedDynamicProperties: () => ({
experimental_flags: rpc.enabledExperimentalFlags(),
}),
});
}
/** v1's `requiredWorkDir`: reject blank and normalize to the canonical spelling. */
function normalizeRequiredWorkDir(operation: string, workDir: string): string {
if (typeof workDir !== 'string' || workDir.trim() === '') {
throw new KimiError(ErrorCodes.REQUEST_WORK_DIR_REQUIRED, `${operation} requires workDir`);
}
return normalizeWorkDir(workDir);
}
/**
* Restate an engine `Error2` in the SDK's public error shape (`KimiError`,
* what `isKimiError` branches on) so the delegated management plane throws
* the same class the v1 client throws for the same failure. Non-Error2
* failures (DI resolution bugs, aborts) pass through untouched.
*
* An engine code this build's registry does not declare (a newer engine than
* the pinned SDK) restates as `internal` β stamping the unknown code would
* mint a `KimiError` that `toKimiErrorPayload` cannot serialize (its
* `KIMI_ERROR_INFO` lookup throws on undeclared codes).
*/
function restateEngineError(error: unknown): unknown {
if (!isError2(error)) return error;
const code: KimiErrorCode = isKimiErrorCode(error.code) ? error.code : ErrorCodes.INTERNAL;
return new KimiError(code, error.message, {
details: error.details as Record<string, unknown> | undefined,
cause: error.cause,
});
}
/**
* v1's `toManagedServerInfo` over the engine's managed view: flatten the
* config to the top level (mutable entries carry the full values, read-only
* entries the redacted `envKeys` / `headerKeys` lists) and tag it with the
* source metadata.
*/
function toManagedServerInfo(server: McpManagedServer): McpManagedServerInfo {
return {
name: server.name,
...server.config,
source: server.source,
origin: server.origin,
mutable: server.mutable,
plugin: server.plugin,
} as McpManagedServerInfo;
}
function describeWorkspaceMcpServer(
name: string,
config: WorkspaceMcpServerConfig,
): WorkspaceTrustInfo['gatedMcpServers'][number] {
if (config.transport === 'stdio') {
return {
name,
transport: config.transport,
command: config.command,
args: config.args,
cwd: config.cwd,
};
}
return { name, transport: config.transport, url: config.url };
}
|